diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-10-24 00:42:09 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-10-24 00:42:09 +0000 |
| commit | 8afa208ffbb9ecc1b6195aef20d269e2fefd88d3 (patch) | |
| tree | 9dba16a45db59ebe1b10965d38f3844a27cc911f /gtk/file_dlg_win32.c | |
| parent | ede39bfe1fed5b6ea7949c610cffe34315266803 (diff) | |
Windows build: #include winsock2.h only when needed.
#include winsock2.h pulls in about 90 distinct .h files
and about 140 total .h files.
Currently winsock2.h is (mostly unnecessarily) included
for each dissector via packet.h/wtap.h.
This patch removes #include winsock2.h from wtap.h and
then includes winsock2.h (or windows.h) in the
few specific places required.
With this patch, my Windows Wireshark build takes
about 30% less time.
svn path=/trunk/; revision=26535
Diffstat (limited to 'gtk/file_dlg_win32.c')
| -rw-r--r-- | gtk/file_dlg_win32.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk/file_dlg_win32.c b/gtk/file_dlg_win32.c index 5afcafd92f..2dc1eced57 100644 --- a/gtk/file_dlg_win32.c +++ b/gtk/file_dlg_win32.c @@ -34,6 +34,12 @@ #include <io.h> #include <fcntl.h> +#include <windows.h> +#include <windowsx.h> +#include <commdlg.h> +#include <richedit.h> + + #include <gtk/gtk.h> #include "epan/filesystem.h" @@ -59,11 +65,6 @@ #include "gtk/file_dlg_win32.h" #include "gtk/help_dlg.h" -#include <windows.h> -#include <windowsx.h> -#include <commdlg.h> -#include <richedit.h> - typedef enum { merge_append, merge_chrono, |