Commit 96b2748a authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


include/my_net.h:
  Auto merged
parents 0dfa6c95 24cdd480

include/my_net.h

+8 −0
Original line number Diff line number Diff line
@@ -55,6 +55,14 @@ C_MODE_START 


#if defined(__WIN__)

#define O_NONBLOCK 1    /* For emulation of fcntl() */



/*

  SHUT_RDWR is called SD_BOTH in windows and

  is defined to 2 in winsock2.h

  #define SD_BOTH 0x02

*/

#define SHUT_RDWR 0x02



#endif



/*