BUILDING_LIBPCAP -> BUILDING_PCAP.

So nobody thinks it means "building libpcap, as opposed to building
WinPcap", and therefore that it should *not* be defined when building
for Windows.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c13d7457e2074a1c9dc50ba535f349954cfa233c..7b2b1bde6625a5c4f573efd6b5ccc1a6b33843e6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ if( WIN32 )
     )
 endif( WIN32)
 
-add_definitions( -DBUILDING_LIBPCAP )
+add_definitions( -DBUILDING_PCAP )
 
 if( MSVC )
     add_definitions( -D__STDC__ )

diff --git a/Makefile.in b/Makefile.in
index a8e62b215d86c2e6de870c354230193d75cbffa2..12e9d4871b99c6c3a3ae8a069d6e22c575e686fc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,7 +49,7 @@ LN_S = @LN_S@
 MKDEP = @MKDEP@
 CCOPT = @V_CCOPT@
 INCLS = -I. @V_INCLS@
-DEFS = -DBUILDING_LIBPCAP @DEFS@ @V_DEFS@
+DEFS = -DBUILDING_PCAP @DEFS@ @V_DEFS@
 ADDLOBJS = @ADDLOBJS@
 ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@
 LIBS = @LIBS@

diff --git a/Win32/Prj/libpcap.dsp b/Win32/Prj/libpcap.dsp
index 23af5354724c7ae553d09749cb8214a3457a7345..057459ef4d3f6cf9016a1797ec17c25241e4ed23 100644 (file)
--- a/Win32/Prj/libpcap.dsp
+++ b/Win32/Prj/libpcap.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../lbl/" /I "../../bpf/" /I "../include/" /I "../../../../common" /I "../../../../dag/include" /I "../../../../dag/drv/windows" /D "NDEBUG" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "BUILDING_LIBPCAP" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D "_MBCS" /D "HAVE_ADDRINFO" /D "WIN32" /D _U_= /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../lbl/" /I "../../bpf/" /I "../include/" /I "../../../../common" /I "../../../../dag/include" /I "../../../../dag/drv/windows" /D "NDEBUG" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "BUILDING_PCAP" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D "_MBCS" /D "HAVE_ADDRINFO" /D "WIN32" /D _U_= /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../lbl/" /I "../../bpf/" /I "../include/" /I "../../../../common" /I "../../../../dag/include" /I "../../../../dag/drv/windows" /D "_DEBUG" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "BUILDING_LIBPCAP" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D "_MBCS" /D "HAVE_ADDRINFO" /D "WIN32" /D _U_= /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../lbl/" /I "../../bpf/" /I "../include/" /I "../../../../common" /I "../../../../dag/include" /I "../../../../dag/drv/windows" /D "_DEBUG" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "BUILDING_PCAP" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D "_MBCS" /D "HAVE_ADDRINFO" /D "WIN32" /D _U_= /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

diff --git a/cmake/preconfigure.cmake b/cmake/preconfigure.cmake
index f88a95fc87c56c585a225444cff544b9bdb49329..c8c92a48edd707c7da7de2a7bf1398af796237e9 100644 (file)
--- a/cmake/preconfigure.cmake
+++ b/cmake/preconfigure.cmake
@@ -11,7 +11,7 @@ if( NOT LIBPCAP_PRECONFIGURED )
     # Project setings
     ######################################
 
-    add_definitions( -DBUILDING_LIBPCAP )
+    add_definitions( -DBUILDING_PCAP )
 
     if( MSVC )
         add_definitions( -D__STDC__ )

diff --git a/pcap/export-defs.h b/pcap/export-defs.h
index 762ecae7d3ca1477a53b3d9ed02ea70a7f0c01ee..a2350579dc4ed9101bc8fbdc711ad70a919eb6d8 100644 (file)
--- a/pcap/export-defs.h
+++ b/pcap/export-defs.h
@@ -56,7 +56,7 @@
             (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))))
 
 #if defined(_WIN32)
-  #ifdef BUILDING_LIBPCAP
+  #ifdef BUILDING_PCAP
     /*
      * We're compiling libpcap, so we should export functions in our
      * API.
@@ -69,7 +69,7 @@
   /* XXX - does this need special treatment? */
   #define PCAP_API_DEF
 #else /* UN*X */
-  #ifdef BUILDING_LIBPCAP
+  #ifdef BUILDING_PCAP
     /*
      * We're compiling libpcap, so we should export functions in our API.
      * The compiler might be configured not to export functions from a

diff --git a/pcap/pcap.h b/pcap/pcap.h
index 2f58f1c043f421a46e6531eb1b0865b0d43ae339..67b86d31e0db426ebcf8f5ce2aa90422a7688fe0 100644 (file)
--- a/pcap/pcap.h
+++ b/pcap/pcap.h
@@ -362,7 +362,7 @@ PCAP_API pcap_t     *pcap_open_offline(const char *, char *);
    * If we're building libpcap, these are internal routines in savefile.c,
    * so we mustn't define them as macros.
    */
-  #ifndef BUILDING_LIBPCAP
+  #ifndef BUILDING_PCAP
     #define pcap_fopen_offline_with_tstamp_precision(f,p,b) \
        pcap_hopen_offline_with_tstamp_precision(_get_osfhandle(_fileno(f)), p, b)
     #define pcap_fopen_offline(f,b) \