winsock.h portability patch causing portability problem

[Gerald Pfeifer]

Alexandre,

I am afraid the following patch

  revision 1.52 date: 2003/03/31 23:56:35;  author: julliard;  state: Exp; lines: +63 -60
  Try to make winsock.h more portable (based on a patch by Francois
  Gouget).

actually caused a portability problem for FreeBSD.

  /usr/bin/gcc -c -I. -I. -I../../../include -I../../../include  -g -O2
  -Wall -mpreferred-stack-boundary=2 -gstabs+ -Wpointer-arith  -fPIC
  -D_REENTRANT -o pipe.o pipe.c
  In file included from ../../../include/winsock2.h:47,
                   from ../../../include/windows.h:62,
                   from ../../../include/rpc.h:22,
                   from ../../../include/wtypes.h:2,
                   from pipe.c:34:
  ../../../include/winsock.h:925: conflicting types for `htonl'
  /usr/include/machine/endian.h:63: previous declaration of `htonl'
  ../../../include/winsock.h:926: conflicting types for `htons'
  /usr/include/machine/endian.h:64: previous declaration of `htons'
  ../../../include/winsock.h:927: conflicting types for `ntohl'
  /usr/include/machine/endian.h:65: previous declaration of `ntohl'
  ../../../include/winsock.h:928: conflicting types for `ntohs'
  /usr/include/machine/endian.h:66: previous declaration of `ntohs'
  gmake[3]: *** [pipe.o] Error 1
  gmake[3]: Leaving directory `/.amd_mnt/nashira/files5/test/wine/dlls/kernel/tests'
  gmake[2]: *** [tests] Error 2
  gmake[2]: Leaving directory `/.amd_mnt/nashira/files5/test/wine/dlls/kernel'

The FreeBSD declarations are
  unsigned long   htonl __P((unsigned long));
  unsigned short  htons __P((unsigned short));
  unsigned long   ntohl __P((unsigned long));
  unsigned short  ntohs __P((unsigned short));

Sorry,
Gerald