[Spread-cvs] commit: r565 - trunk/daemon

[jonathan at spread.org]

Author: jonathan
Date: 2013-03-27 23:47:26 -0400 (Wed, 27 Mar 2013)
New Revision: 565

Modified:
   trunk/daemon/Changelog
   trunk/daemon/arch.h
Log:
Apply windows portability fix by Juan Pizzorno and update Changelog

Modified: trunk/daemon/Changelog
===================================================================
--- trunk/daemon/Changelog	2013-03-28 03:39:11 UTC (rev 564)
+++ trunk/daemon/Changelog	2013-03-28 03:47:26 UTC (rev 565)
@@ -1,3 +1,13 @@
+Wed Mar 27 23:43:00 2013  Jonathan Stanton  <jonathan at spreadconcepts.com>
+
+	* arch.h: Apply Windows portability fixes by Juan Pizzorno. 
+
+Wed Mar 27 23:15:20 2013  Jonathan Stanton  <jonathan at spreadconcepts.com>
+
+	* libspread-util/: Merge libspread-util library from 4.2.0rc1 release
+	to current trunk which will be 4.3.0 release. This includes several
+	portability fixes for windows and removing a too-frequent print in events.
+
 2013-03-18 13:48:41 John Schultz <jschultz at spreadconcepts.com>
 
 	* configuration.c, ip_enum.[ch], daemon/Makefile.in: 

Modified: trunk/daemon/arch.h
===================================================================
--- trunk/daemon/arch.h	2013-03-28 03:39:11 UTC (rev 564)
+++ trunk/daemon/arch.h	2013-03-28 03:47:26 UTC (rev 565)
@@ -124,8 +124,6 @@
 #define		ARCH_SCATTER_NONE
 #define		ARCH_ENDIAN	0x80000080
 #define         LOC_INLINE      
-typedef         unsigned long   sockopt_len_t;
-typedef         unsigned long   socklen_t;
 #define         BADCLOCK
 #define         HAVE_GOOD_VARGS
 /* Windows now has a strerror function and if we do not use it 
@@ -146,6 +144,12 @@
  * can be raised by defining a larger constant before including windows.h winsock.h
  */
 #define         FD_SETSIZE      1024
+
+#include <ws2tcpip.h>   /* after definition of FD_SETSIZE! */
+
+#define         HAVE_SOCKLEN_T 1
+typedef         int             sockopt_len_t;
+
 /* System location of spread.conf file */
 #define         SPREAD_ETCDIR   "/etc"
 /* Use winsock constants since we are dealing with sockets