commit: r685 - in trunk: daemon win32

Author: jschultz
Date: 2014-01-24 15:57:17 -0500 (Fri, 24 Jan 2014)
New Revision: 685

Modified:
   trunk/daemon/config_parse.y
   trunk/daemon/spread.c
   trunk/win32/spread.sln
Log:
Fix some Windows build problems + warnings


Modified: trunk/daemon/config_parse.y
===================================================================
--- trunk/daemon/config_parse.y	2014-01-24 19:34:56 UTC (rev 684)
+++ trunk/daemon/config_parse.y	2014-01-24 20:57:17 UTC (rev 685)
@@ -60,6 +60,11 @@
 #include "conf_body.h"
 #include "acm.h"
 
+#ifdef ARCH_PC_WIN95
+#  define strdup _strdup
+#  define fileno _fileno
+#endif
+
         int     line_num, semantic_errors;
  extern char    *yytext;
  extern int     yyerror(char *str);
@@ -255,7 +260,7 @@
     strncat( segstr, "\n", strsize - curlen);
     curlen += 1;
 
-    if (curlen > strsize) {
+    if ((int) curlen > strsize) {
         /* ran out of space in string -- should never happen. */
         Alarmp( SPLOG_ERROR, CONF_SYS, "config_parse.y:convert_segment_to_string: The segment string is too long! %d characters attemped is more then %d characters allowed", curlen, strsize);
         Alarmp( SPLOG_ERROR, CONF_SYS, "config_parse.y:convert_segment_to_string:The error occured on segment %d.%d.%d.%d. Successful string was: %s\n",

Modified: trunk/daemon/spread.c
===================================================================
--- trunk/daemon/spread.c	2014-01-24 19:34:56 UTC (rev 684)
+++ trunk/daemon/spread.c	2014-01-24 20:57:17 UTC (rev 685)
@@ -32,7 +32,6 @@
  *    Dan Schoenblum       [email protected] - Java interface.
  *
  */
- */
 
 #include <string.h>
 

Modified: trunk/win32/spread.sln
===================================================================
--- trunk/win32/spread.sln	2014-01-24 19:34:56 UTC (rev 684)
+++ trunk/win32/spread.sln	2014-01-24 20:57:17 UTC (rev 685)
@@ -5,6 +5,9 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush_user", "flush_user.vcxproj", "{6012883E-3670-40AD-B86F-E743F0B685CA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspread", "libspread.vcxproj", "{EE70513E-C9C9-48E4-B755-0A3E2BA67EAC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{64900984-F23D-4EE1-9D29-47FD788951E3} = {64900984-F23D-4EE1-9D29-47FD788951E3}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spflooder", "spflooder.vcxproj", "{112A90EA-43CD-4AA8-A643-7EBE9621682B}"
 	ProjectSection(ProjectDependencies) = postProject