commit: r296 - in trunk: . daemon libspread win32

Author: jgreen
Date: 2006-02-16 16:36:37 -0500 (Thu, 16 Feb 2006)
New Revision: 296

Added:
   trunk/win32/flush_user.vcproj
   trunk/win32/libspread-core.vcproj
   trunk/win32/libspread.vcproj
   trunk/win32/libtspread-core.vcproj
   trunk/win32/spflooder.vcproj
   trunk/win32/spread.sln
   trunk/win32/spread.vcproj
   trunk/win32/sprecv.vcproj
   trunk/win32/spsend.vcproj
   trunk/win32/sptmonitor.vcproj
   trunk/win32/sptuser.vcproj
   trunk/win32/spuser.vcproj
Removed:
   trunk/win32/flooder.dsp
   trunk/win32/libsp.dsp
   trunk/win32/libtsp.dsp
   trunk/win32/r.dsp
   trunk/win32/s.dsp
   trunk/win32/spread.dsp
   trunk/win32/spread.dsw
   trunk/win32/sptmonitor.dsp
   trunk/win32/tuser.dsp
   trunk/win32_msvc_net/
Modified:
   trunk/daemon/arch.h
   trunk/daemon/events.c
   trunk/libspread/sp.c
Log:
Fixes for win32, and new win32 project files

- remove the old win32 project files
- add win32 new project files for visual studio .Net 2002.
- fixs  in code for win32 compilation.




Modified: trunk/daemon/arch.h
===================================================================
--- trunk/daemon/arch.h	2006-02-16 21:24:20 UTC (rev 295)
+++ trunk/daemon/arch.h	2006-02-16 21:36:37 UTC (rev 296)
@@ -132,7 +132,6 @@
 #define         ARCH_SCATTER_SIZE       64
 #define         ERR_TIMEDOUT    EAGAIN
 #define         sock_errno      WSAGetLastError()
-#define         sock_strerror   sock_strerror
 #define         sock_set_errno  WSASetLastError
 #define         MAXPATHLEN      _MAX_PATH
 #define         snprintf        _snprintf
@@ -162,6 +161,8 @@
 
 #ifndef int16
 #define int16 short
+char *soch_strerror(int err);  /* forward declare this func from the arch.c file (win32 only) */
+
 #endif
 
 #ifndef int16u

Modified: trunk/daemon/events.c
===================================================================
--- trunk/daemon/events.c	2006-02-16 21:24:20 UTC (rev 295)
+++ trunk/daemon/events.c	2006-02-16 21:36:37 UTC (rev 296)
@@ -342,7 +342,7 @@
                 Alarm( EVENTS, "E_delay: select delay returned error: %s\n", strerror(errno));
         }
 #else  /* ARCH_PC_WIN95 */
-        SleepEx( tmp_t.sec*1000+tmp_t.usec/1000, 0 );
+        SleepEx( tmp_t.tv_sec*1000+tmp_t.tv_usec/1000, 0 );
 #endif /* ARCH_PC_WIN95 */   
 
 }

Modified: trunk/libspread/sp.c
===================================================================
--- trunk/libspread/sp.c	2006-02-16 21:24:20 UTC (rev 295)
+++ trunk/libspread/sp.c	2006-02-16 21:36:37 UTC (rev 296)
@@ -71,9 +71,9 @@
 #include "acm.h"
 
 enum sp_sess_state {
-    UNUSED,
-    ACTIVE,
-    ERROR,
+    SESS_UNUSED,
+    SESS_ACTIVE,
+    SESS_ERROR,
 };
 
 typedef	struct	dummy_sp_session {
@@ -353,7 +353,7 @@
         if ( num_ready == 0 ) {
             /* timeout */
             close(s);
-            sock_set_errno( ERR_TIMEDOUT );
+            sock_set_errno( ERR_TIMEDOUT );