diff options
| author | grahamb <grahamb@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-04-04 12:18:10 +0000 |
|---|---|---|
| committer | grahamb <grahamb@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-04-04 12:18:10 +0000 |
| commit | 108bf33f854b21f1ddbe6ff7b64385591d724d42 (patch) | |
| tree | 19ecfbedace401047292090b58abfaf93fe7dc6e /epan/emem.c | |
| parent | e8c2133e6495d620eb63921d2af6f417ed29f076 (diff) | |
Fix build failures due to windows.h being included before winsock2.h via other includes
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21335 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/emem.c')
| -rw-r--r-- | epan/emem.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/emem.c b/epan/emem.c index d2e05e7200..f8d00ae602 100644 --- a/epan/emem.c +++ b/epan/emem.c @@ -40,16 +40,16 @@ #include <unistd.h> #endif -#ifdef _WIN32 -#include <windows.h> /* VirtualAlloc, VirtualProtect */ -#include <process.h> /* getpid */ -#endif - #include <glib.h> #include <proto.h> #include "emem.h" #include <wiretap/file_util.h> +#ifdef _WIN32 +#include <windows.h> /* VirtualAlloc, VirtualProtect */ +#include <process.h> /* getpid */ +#endif + /* * Tools like Valgrind and ElectricFence don't work well with memchunks. |