[ShareDaemon-CVS] core/src Makefile.cvs,1.8,1.9 osdep.h,1.10,1.11

[<bo...@us...>]

Update of /cvsroot/sharedaemon/core/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4828

Modified Files:
	Makefile.cvs osdep.h 
Log Message:
Fixed compilation problem with MingW32.

Index: Makefile.cvs
===================================================================
RCS file: /cvsroot/sharedaemon/core/src/Makefile.cvs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.cvs	20 Nov 2003 16:27:25 -0000	1.8
+++ Makefile.cvs	21 Nov 2003 04:04:17 -0000	1.9
@@ -20,11 +20,14 @@
 
 all: test
 
+CXX = /usr/i686-mingw32msvc/bin/g++
+CC  = /usr/i686-mingw32msvc/bin/gcc
+
 CFLAGS    = -g -Wall -O3 -std=c99
 CXXFLAGS  = -g -Wall -O3
 CPPFLAGS  = -DXMULE2
 # You may set -DHAVE_ANSI_COLORS to get colored output
-LDFLAGS  += -g -lm
+LDFLAGS  += -g -lm -lwsock32
 # -lstdc++
 
 OBJS = ClientList.oo Client.oo test.oo ClientShadow.oo Socket.oo osdep.oo \

Index: osdep.h
===================================================================
RCS file: /cvsroot/sharedaemon/core/src/osdep.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- osdep.h	20 Nov 2003 16:27:25 -0000	1.10
+++ osdep.h	21 Nov 2003 04:04:17 -0000	1.11
@@ -58,7 +58,9 @@
 #endif // Do POSIX stuff afterwards.
 
 #ifdef WIN32
+#define Array Hidden_Array
 #include <winsock2.h>
+#undef Array
 #include <winuser.h>
 //#include <windows.h>
 #include <stdlib.h>