diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-11-23 08:33:00 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-11-23 08:33:00 +0000 |
| commit | dec54e9c4d86bd8b6298b66c09045cc3d1d358bf (patch) | |
| tree | b9178cb18c453f8880fda7d49a8120da8d66d00b | |
| parent | 39fe3c0cee44b521c4a608fa36ead74f4477bb08 (diff) | |
We don't need ole32.lib any more; don't link with it and don't include a
header file for it.
We also don't monkey around with wide characters any more, so don't
include <tchar.h>.
Depending on the SDK you're using and/or the version of Windows on which
you're building, NDIS_IF_MAX_STRING_SIZE and NETIO_STATUS might not be
defined; define them if not. Thanks to Gisle Vanem for that fix.
svn path=/trunk/; revision=46150
| -rw-r--r-- | capture_win_ifnames.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/capture_win_ifnames.c b/capture_win_ifnames.c index c68ebe736e..0fb57885a9 100644 --- a/capture_win_ifnames.c +++ b/capture_win_ifnames.c @@ -30,8 +30,6 @@ #ifdef _WIN32 #include <windows.h> -#include <objbase.h> /* for CLSIDFromString() to convert guid text to a GUID */ -#include <tchar.h> #include <winsock2.h> #include <iphlpapi.h> #include <stdio.h> @@ -43,15 +41,20 @@ #include <ntddndis.h> +#ifndef NDIS_IF_MAX_STRING_SIZE +#define NDIS_IF_MAX_STRING_SIZE IF_MAX_STRING_SIZE /* =256 in <ifdef.h> */ +#endif + +#ifndef NETIO_STATUS +#define NETIO_STATUS DWORD +#endif + #include "log.h" #include "capture_ifinfo.h" #include "capture_win_ifnames.h" #include "wsutil/file_util.h" -/* Link with ole32.lib - provides CLSIDFromString() to convert guid text to a GUID */ -#pragma comment(lib, "ole32.lib") - /**********************************************************************************/ gboolean IsWindowsVistaOrLater() { |