[Spread-cvs] cvs commit: spread/daemon CVS_Readme.txt alarm.c arch.h events.c log.c

[jonathan at spread.org]

jonathan    04/10/14 13:22:40

  Modified:    daemon   CVS_Readme.txt alarm.c arch.h events.c log.c
  Log:
  Fix compile problem on Windows because of EINPROGRESS error.
  Document need to remove unistd.h include from lex.yy.c after parser is built.
  
  Revision  Changes    Path
  1.4       +4 -0      spread/daemon/CVS_Readme.txt
  
  Index: CVS_Readme.txt
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/CVS_Readme.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CVS_Readme.txt	14 Oct 2004 16:59:07 -0000	1.3
  +++ CVS_Readme.txt	14 Oct 2004 17:22:40 -0000	1.4
  @@ -61,3 +61,7 @@
     x) Update the SPREAD_VERSION define in sp.h
   
     x) Update build date in spread.c and monitor.c initial Alarm prints.
  + 
  +  x) After release source tar is built and parser is built. Make sure
  +     lex.yy.c does not #include <unistd.h> without protecting it by 
  +     #ifndef ARCH_PC_WIN95 ... #endif
  
  
  
  1.9       +1 -0      spread/daemon/alarm.c
  
  Index: alarm.c
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/alarm.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- alarm.c	2 Oct 2004 22:16:00 -0000	1.8
  +++ alarm.c	14 Oct 2004 17:22:40 -0000	1.9
  @@ -42,6 +42,7 @@
   #undef EINTR
   #undef EAGAIN
   #undef EWOULDBLOCK
  +#undef EINPROGRESS
   #endif
   #include <errno.h>
   
  
  
  
  1.18      +2 -0      spread/daemon/arch.h
  
  Index: arch.h
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/arch.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- arch.h	24 Sep 2004 14:59:23 -0000	1.17
  +++ arch.h	14 Oct 2004 17:22:40 -0000	1.18
  @@ -149,9 +149,11 @@
   #undef EINTR
   #undef EAGAIN
   #undef EWOULDBLOCK
  +#undef EINPROGRESS
   #define EWOULDBLOCK WSAEWOULDBLOCK
   #define EINTR       WSAEINTR
   #define EAGAIN      WSAEWOULDBLOCK
  +#define EINPROGRESS WSAEINPROGRESS
   
   #ifndef int16
   #define int16 short
  
  
  
  1.8       +1 -0      spread/daemon/events.c
  
  Index: events.c
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/events.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- events.c	24 Sep 2004 14:57:29 -0000	1.7
  +++ events.c	14 Oct 2004 17:22:40 -0000	1.8
  @@ -39,6 +39,7 @@
   #undef EINTR
   #undef EAGAIN
   #undef EWOULDBLOCK
  +#undef EINPROGRESS
   #endif
   #include <errno.h>
   
  
  
  
  1.6       +1 -0      spread/daemon/log.c
  
  Index: log.c
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/log.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- log.c	5 Mar 2004 00:32:46 -0000	1.5
  +++ log.c	14 Oct 2004 17:22:40 -0000	1.6
  @@ -40,6 +40,7 @@
   #undef EINTR
   #undef EAGAIN
   #undef EWOULDBLOCK
  +#undef EINPROGRESS
   #endif
   #include <errno.h>