osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Jörg Mayer 2009-05-11 18:46:19 +00:00
parent 54d5fdd08d
commit ec71e49011
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airpcap_loader.c
View File

@ -24,7 +24,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#ifdef _WIN32
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
@ -2457,6 +2456,7 @@ int load_airpcap(void)
BOOL base_functions = TRUE; BOOL base_functions = TRUE;
BOOL eleven_n_functions = TRUE; BOOL eleven_n_functions = TRUE;
#ifdef _WIN32
if((AirpcapLib = LoadLibrary(TEXT("airpcap.dll"))) == NULL) if((AirpcapLib = LoadLibrary(TEXT("airpcap.dll"))) == NULL)
{ {
/* Report the error but go on */ /* Report the error but go on */
@ -2516,6 +2516,9 @@ int load_airpcap(void)
} }
} }
return AirpcapVersion; return AirpcapVersion;
#else /* _WIN32 */
return AIRPCAP_DLL_NOT_FOUND;
#endif /* _WIN32 */
} }
/* /*
@ -2546,4 +2549,3 @@ get_runtime_airpcap_version(GString *str)
vrev, build); vrev, build);
} }
#endif /* HAVE_AIRPCAP */ #endif /* HAVE_AIRPCAP */
#endif /* _WIN32 */