[Dotgnu-pnet-commits] CVS: pnet/support allocate.c,1.5,1.6 dns.c,1.1,1.2socket.c,1.13,1.14test_float.c,1.6,1.7

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/support
In directory subversions:/tmp/cvs-serv20109/support

Modified Files:
        allocate.c dns.c dynlib.c filemap.c socket.c test_float.c 
Log Message:


#include fixes for non-cygwin win32 builds.


Index: allocate.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/support/allocate.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** allocate.c  12 Jun 2002 07:27:08 -0000      1.5
--- allocate.c  17 Jun 2003 05:08:50 -0000      1.6
***************
*** 29,34 ****
--- 29,36 ----
        #include <unistd.h>
  #endif
+ #if !(defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__))
  #ifdef HAVE_SYS_MMAN_H
        #include <sys/mman.h>
+ #endif
  #endif
  #ifdef HAVE_FCNTL_H

Index: dns.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/support/dns.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** dns.c       14 Sep 2002 15:29:17 -0000      1.1
--- dns.c       17 Jun 2003 05:08:50 -0000      1.2
***************
*** 21,24 ****
--- 21,27 ----
  #include "il_system.h"
  #include "il_utils.h"
+ #ifdef IL_WIN32_PLATFORM
+ #include <winsock.h>
+ #else
  #if HAVE_STDLIB_H
  #include <stdlib.h>
***************
*** 26,29 ****
--- 29,33 ----
  #if HAVE_NETDB_H
  #include <netdb.h>
+ #endif 
  #endif 
  

Index: dynlib.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/support/dynlib.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** dynlib.c    16 Jun 2003 23:56:47 -0000      1.9
--- dynlib.c    17 Jun 2003 05:08:50 -0000      1.10
***************
*** 21,29 ****
  #include <stdio.h>
  #include "il_system.h"
  #ifdef HAVE_DLFCN_H
        #include <dlfcn.h>
  #endif
- #ifdef IL_WIN32_NATIVE
-       #include <windows.h>
  #endif
  
--- 21,30 ----
  #include <stdio.h>
  #include "il_system.h"
+ #ifdef IL_WIN32_NATIVE
+       #include <windows.h>
+ #else
  #ifdef HAVE_DLFCN_H
        #include <dlfcn.h>
  #endif
  #endif
  

Index: filemap.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/support/filemap.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** filemap.c   13 Dec 2002 11:24:47 -0000      1.4
--- filemap.c   17 Jun 2003 05:08:50 -0000      1.5
***************
*** 21,24 ****
--- 21,29 ----
  #include "il_system.h"
  #include "mem_debug.h"
+ #if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
+       #include <windows.h>
+       #include <io.h>
+       #define IL_USE_WIN32_MMAP
+ #else
  #ifdef HAVE_SYS_TYPES_H
        #include <sys/types.h>
***************
*** 30,37 ****
        #include <sys/mman.h>
  #endif
- #if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
-       #include <windows.h>
-       #include <io.h>
-       #define IL_USE_WIN32_MMAP
  #endif
  
--- 35,38 ----

Index: socket.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/support/socket.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** socket.c    31 May 2003 22:07:00 -0000      1.13
--- socket.c    17 Jun 2003 05:08:50 -0000      1.14
***************
*** 24,27 ****
--- 24,32 ----
  #ifdef IL_CONFIG_NETWORKING
  
+ #ifdef IL_WIN32_NATIVE
+ #include <winsock.h>
+ #include <time.h>
+ #define       close   closesocket
+ #else
  #if TIME_WITH_SYS_TIME
        #include <sys/time.h>
***************
*** 53,62 ****
  #endif
  #include <errno.h>
- #ifdef IL_WIN32_NATIVE
- #include <winsock.h>
- #endif
  #if HAVE_LINUX_IRDA_H
  #include <linux/types.h>
  #include <linux/irda.h>
  #endif
  
--- 58,65 ----
  #endif
  #include <errno.h>
  #if HAVE_LINUX_IRDA_H
  #include <linux/types.h>
  #include <linux/irda.h>
+ #endif
  #endif
  

Index: test_float.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/support/test_float.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** test_float.c        15 May 2003 02:46:28 -0000      1.6
--- test_float.c        17 Jun 2003 05:08:50 -0000      1.7
***************
*** 23,29 ****
  #include <math.h>
  #endif
- #ifdef HAVE_IEEEFP_H
- #include <ieeefp.h>
- #endif
  #ifdef IL_WIN32_NATIVE
  #include <float.h>
--- 23,26 ----
***************
*** 32,35 ****
--- 29,36 ----
  #endif
  #define HAVE_ISNAN 1
+ #else
+ #ifdef HAVE_IEEEFP_H
+ #include <ieeefp.h>
+ #endif
  #endif