Update of /cvsroot/javanetsim/IceScan/icesockets
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10967/icesockets
Modified Files:
sock_types.h sock_win.h
Log Message:
Index: sock_types.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_types.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** sock_types.h 17 Dec 2006 11:00:20 -0000 1.18
--- sock_types.h 17 Dec 2006 11:46:35 -0000 1.19
***************
*** 21,26 ****
#ifdef WIN32
! #define __WIN32__
! #define __NO_LIBPCRE__
#else
--- 21,25 ----
#ifdef WIN32
! #define __WIN32__
#else
Index: sock_win.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_win.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sock_win.h 17 Dec 2006 09:59:40 -0000 1.3
--- sock_win.h 17 Dec 2006 11:46:35 -0000 1.4
***************
*** 13,19 ****
#ifdef WIN32
!
! #pragma comment(lib, "ws2_32.lib")
#pragma comment(lib, "wpcap.lib")
#include <winsock2.h>
--- 13,25 ----
#ifdef WIN32
!
! //#define __NO_LIBPCRE__
! #undef __NO_LIBPCRE__
!
! #pragma comment(lib, "ws2_32.lib")
#pragma comment(lib, "wpcap.lib")
+ #ifndef __NO_LIBPCRE__
+ #pragma comment(lib, "libpcre.lib")
+ #endif
#include <winsock2.h>
|
