Changeset 6858


Ignore:
Timestamp:
10/28/16 13:47:35 (3 years ago)
Author:
kevin
Message:

Modifed to use winsock2.h instead of winsock.h to resolve issues with the new version of slink2ew

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/environment/ew_nt.cmd

    r6803 r6858  
    7878@rem   Define _CRT_SECURE_NO_DEPRECATE and _CRT_SECURE_NO_WARNINGS to suppress deprecation warnings 
    7979@rem   Define _USE_32BIT_TIME_T for 32-bit-sized 'time_t' type (on 32-bit-platform builds): 
    80 set GLOBALFLAGS=/D_WINNT /D_INTEL /D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_USE_32BIT_TIME_T /Od 
     80set GLOBALFLAGS=/DWIN32_LEAN_AND_MEAN /D_WINNT /D_INTEL /D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_USE_32BIT_TIME_T /Od 
    8181 
    8282@rem Set INIT, the path to the tools.ini file which gets used by 
  • trunk/include/platform.h

    r6803 r6858  
    6060 
    6161#ifdef _WINNT 
    62 #include <stdio.h> 
    63 #include <stdlib.h> 
     62#ifndef WIN32_LEAN_AND_MEAN 
     63#define WIN32_LEAN_AND_MEAN 
     64#endif 
     65#include <stdio.h> 
     66#include <stdlib.h> 
     67#include <winsock2.h>              /* Socket stuff */ 
    6468#include <windows.h> 
    65 #include <winsock.h>               /* Socket stuff */ 
    6669#include <process.h>               /* Required for getpid() */ 
    6770#include <sys\types.h> 
  • trunk/include/startstop_winlib.h

    r6164 r6858  
    3232#include <startstop_lib.h> 
    3333#include <service_ew.h>         /* the non-service needs to know about this too */ 
     34#include <wtypes.h>             /* defines boolean */ 
    3435 
    3536  /****************************************************************** 
  • trunk/include/time_ew.h

    r6803 r6858  
    4040#include <time.h> 
    4141#ifdef _WINNT                /* if Windows then */ 
    42 #include <winsock.h>         /* include for definition of 'timeval' */ 
     42#include <winsock2.h>        /* include for definition of 'timeval' */ 
    4343#endif 
    4444 
  • trunk/src/archiving/archman/lib/makefile.nt

    r6803 r6858  
    2424# how to compile a source module 
    2525.c.obj: 
    26    $(CC) /nologo $(cflags) $(cdebug) -D_MT $(tflags) -D_NTSDK -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS $< 
     26   $(CC) $(GLOBALFLAGS) /nologo $(cflags) $(cdebug) -D_MT $(tflags) -D_NTSDK -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS $< 
    2727 
    2828# main dependencies 
  • trunk/src/data_exchange/getfileII/socket_win.c

    r6803 r6858  
    2121#include <stdlib.h> 
    2222#include <string.h> 
     23#include <winsock2.h> 
    2324#include <windows.h> 
    2425#include "getfileII.h" 
  • trunk/src/data_exchange/sendfileII/socket_win.c

    r6803 r6858  
    2424#include <stdlib.h> 
    2525#include <string.h> 
     26#include <winsock2.h> 
    2627#include <windows.h> 
    2728#include "sendfileII.h" 
  • trunk/src/seismic_processing/ewthresh/ewthresh.c

    r6803 r6858  
    3535#ifdef _WINNT  
    3636#include <windows.h> 
     37#include <mmsystem.h>           /* PlaySound */ 
    3738#endif 
     39 
    3840#include <stdio.h> 
    3941#include <string.h> 
  • trunk/src/seismic_processing/glass/src/apps/glass/main.cpp

    r2176 r6858  
    2929 
    3030#include <windows.h> 
     31#include <stdlib.h> 
    3132#include "message.h" 
    3233#include "Imodule.h" 
  • trunk/src/seismic_processing/glass/src/apps/glass/nexus.cpp

    r2058 r6858  
    22#include <windows.h> 
    33#include <stdio.h> 
     4#include <stdlib.h> 
    45#include "nexus.h" 
    56#include "module.h" 
  • trunk/src/seismic_processing/glass/src/lib/str.cpp

    r3212 r6858  
    11// str.cpp: General string class - modeled after CString 
    22#include <windows.h> 
     3#include <stdlib.h> 
    34#include "str.h" 
    45 
  • trunk/src/seismic_processing/glass/src/make_defs.nt

    r6803 r6858  
    2525CPP=cl.exe 
    2626INCLUDE_DIRS = -I. -I$(EW_INCLUDE) -I$(GLASS_LIBSRC)  
    27 CPP_FLAGS = /nologo $(cdebug) $(cvarsmt) $(INCLUDE_DIRS) /D_WINNT /W3 -GX 
     27CPP_FLAGS = $(GLOBALFLAGS) /nologo $(cdebug) $(cvarsmt) $(INCLUDE_DIRS) /D_WINNT /W3 -GX 
    2828C_FLAGS = $(CPP_FLAGS) 
    2929 
  • trunk/src/seismic_processing/glass/src/modules/Flinn/flinn.cpp

    r2176 r6858  
    33#include <windows.h> 
    44#include <stdio.h> 
     5#include <stdlib.h> 
    56#include "flinn.h" 
    67#include "str.h" 
  • trunk/src/seismic_processing/loc_wcatwc/locate.c

    r6852 r6858  
    4949#include <transport.h> 
    5050#include "loc_wcatwc.h" 
     51#ifdef _WINNT 
     52#include <mmsystem.h>           /* PlaySound */ 
     53#endif 
    5154 
    5255/* fPP defined in iaspei91.h.  Must be defined as extern for compilation */ 
Note: See TracChangeset for help on using the changeset viewer.