diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2009-05-11 18:46:19 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2009-05-11 18:46:19 +0000 |
| commit | ec71e49011eff3d9c6053d95f61fdee7540e5b8b (patch) | |
| tree | c785360d50aba6514ef9a4b9ee7194e7964e3f2b /airpcap_loader.c | |
| parent | 54d5fdd08d14e89fc62a6c365614c86d0c2e1dfe (diff) | |
| download | wireshark-ec71e49011eff3d9c6053d95f61fdee7540e5b8b.tar.gz | |
Move the #if _WIN32 way inwards. This is needed to make
the whole thing link under Linux - of course we are still
a long way from the code being usable.
Oh, compiling will only work if the windows types get
replaced by glib types, but that is for another patch.
svn path=/trunk/; revision=28331
Diffstat (limited to 'airpcap_loader.c')
| -rw-r--r-- | airpcap_loader.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/airpcap_loader.c b/airpcap_loader.c index d9b7d8a3dd..33b309fc34 100644 --- a/airpcap_loader.c +++ b/airpcap_loader.c @@ -24,7 +24,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef _WIN32 #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -2457,6 +2456,7 @@ int load_airpcap(void) BOOL base_functions = TRUE; BOOL eleven_n_functions = TRUE; +#ifdef _WIN32 if((AirpcapLib = LoadLibrary(TEXT("airpcap.dll"))) == NULL) { /* Report the error but go on */ @@ -2516,6 +2516,9 @@ int load_airpcap(void) } } return AirpcapVersion; +#else /* _WIN32 */ + return AIRPCAP_DLL_NOT_FOUND; +#endif /* _WIN32 */ } /* @@ -2546,4 +2549,3 @@ get_runtime_airpcap_version(GString *str) vrev, build); } #endif /* HAVE_AIRPCAP */ -#endif /* _WIN32 */ |