current cgisimple.c, 1.142, 1.143 configure.in, 1.205, 1.206 jbsockets.c, 1.137, 1.138 jcc.c, 1.446, 1.447 loadcfg.c, 1.153, 1.154 project.h, 1.216, 1.217 w32log.c, 1.52, 1.53

Update of /cvsroot/ijbswa/current
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30012/current

Modified Files:
	cgisimple.c configure.in jbsockets.c jcc.c loadcfg.c project.h 
	w32log.c 
Log Message:
update windows build system to use supported software

The cygwin gcc -mno-cygwin option is no longer supported, so
convert the windows build system to use the cygwin cross-compiler
to build "native" code.



Index: project.h
===================================================================
RCS file: /cvsroot/ijbswa/current/project.h,v
retrieving revision 1.216
retrieving revision 1.217
diff -C2 -d -r1.216 -r1.217
*** project.h	25 May 2016 10:50:55 -0000	1.216
--- project.h	27 Sep 2016 22:48:28 -0000	1.217
***************
*** 54,58 ****
  #  else
  #    include <stdint.h>
- #    include <winsock2.h>
  #    include <ws2tcpip.h>
       typedef unsigned short in_port_t;
--- 54,57 ----

Index: configure.in
===================================================================
RCS file: /cvsroot/ijbswa/current/configure.in,v
retrieving revision 1.205
retrieving revision 1.206
diff -C2 -d -r1.205 -r1.206
*** configure.in	24 Sep 2016 16:16:55 -0000	1.205
--- configure.in	27 Sep 2016 22:48:28 -0000	1.206
***************
*** 303,308 ****
    WIN_ONLY=
    CFLAGS="$CFLAGS -DWINVER=0x501"
!   SPECIAL_CFLAGS="-mwindows -mno-cygwin"
!   PTHREAD_LIB=-lpthreadGC
    echo "Using mingw32 (Win32 GUI)"
  else
--- 303,308 ----
    WIN_ONLY=
    CFLAGS="$CFLAGS -DWINVER=0x501"
!   SPECIAL_CFLAGS="-mwindows"
!   PTHREAD_LIB=-lpthread
    echo "Using mingw32 (Win32 GUI)"
  else
***************
*** 654,657 ****
--- 654,660 ----
  dnl =================================================================
  
+ if test $target_type != mingw; then
+ # i686-w64-mingw32-gcc gets socklen_t define from ws2tcpip.h
+ 
  AC_MSG_CHECKING([for socklen_t])
  AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]),
***************
*** 660,663 ****
--- 663,667 ----
  		[ Define to 'int' if <sys/socket.h> doesn't have it. ]))
  
+ fi
  
  dnl =================================================================
***************
*** 819,822 ****
--- 823,827 ----
    AC_TRY_LINK(
      [
+       #include<winsock2.h>
        #include<windows.h>
        #include<ws2tcpip.h>
***************
*** 830,833 ****
--- 835,839 ----
    AC_TRY_LINK(
      [
+       #include<winsock2.h>
        #include<windows.h>
        #include<ws2tcpip.h>

Index: jbsockets.c
===================================================================
RCS file: /cvsroot/ijbswa/current/jbsockets.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** jbsockets.c	22 Aug 2016 14:50:18 -0000	1.137
--- jbsockets.c	27 Sep 2016 22:48:28 -0000	1.138
***************
*** 51,54 ****
--- 51,55 ----
  #define STRICT
  #endif
+ #include <winsock2.h>
  #include <windows.h>
  #include <sys/timeb.h>

Index: w32log.c
===================================================================
RCS file: /cvsroot/ijbswa/current/w32log.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** w32log.c	28 Jul 2016 00:38:47 -0000	1.52
--- w32log.c	27 Sep 2016 22:48:28 -0000	1.53
***************
*** 42,45 ****
--- 42,46 ----
  #define STRICT
  #endif
+ #include <winsock2.h>
  #include <windows.h>
  #include <richedit.h>
***************
*** 57,65 ****
  const char w32res_h_rcs[] = W32RES_H_VERSION;
  
- #ifdef __MINGW32__
- #include "cygwin.h"
- const char cygwin_h_rcs[] = CYGWIN_H_VERSION;
- #endif
- 
  const char w32log_h_rcs[] = W32LOG_H_VERSION;
  
--- 58,61 ----

Index: jcc.c
===================================================================
RCS file: /cvsroot/ijbswa/current/jcc.c,v
retrieving revision 1.446
retrieving revision 1.447
diff -C2 -d -r1.446 -r1.447
*** jcc.c	25 May 2016 10:54:01 -0000	1.446
--- jcc.c	27 Sep 2016 22:48:28 -0000	1.447
***************
*** 51,54 ****
--- 51,55 ----
  #   define STRICT
  #  endif
+ #  include <winsock2.h>
  #  include <windows.h>
  #  include <process.h>

Index: cgisimple.c
===================================================================
RCS file: /cvsroot/ijbswa/current/cgisimple.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -d -r1.142 -r1.143
*** cgisimple.c	22 May 2016 12:43:07 -0000	1.142
--- cgisimple.c	27 Sep 2016 22:48:28 -0000	1.143
***************
*** 1947,1953 ****
     SHOW_RCS(cgisimple_h_rcs)
     SHOW_RCS(cgisimple_rcs)
- #ifdef __MINGW32__
-    SHOW_RCS(cygwin_h_rcs)
- #endif
     SHOW_RCS(deanimate_h_rcs)
     SHOW_RCS(deanimate_rcs)
--- 1947,1950 ----

Index: loadcfg.c
===================================================================
RCS file: /cvsroot/ijbswa/current/loadcfg.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -d -r1.153 -r1.154
*** loadcfg.c	22 May 2016 12:43:07 -0000	1.153
--- loadcfg.c	27 Sep 2016 22:48:28 -0000	1.154
***************
*** 54,57 ****
--- 54,58 ----
  #  define STRICT
  # endif
+ # include <winsock2.h>
  # include <windows.h>
  


------------------------------------------------------------------------------