gcc 4.7 would complain that the getopt stuff was not declared.

Looks like getopt.h was silently included somewhere in gcc-4.6's
includes. Explicitely include <getopt.h>. No idea whether this
is the correct fix.
Whitespace change: indent includes, if they are inside a conditional.

svn path=/trunk/; revision=41847

1 files changed, 19 insertions, 17 deletions

diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 9cd9eeae4a..242296fad6 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -31,11 +31,13 @@
 #include <glib.h>
 
 #ifndef HAVE_GETOPT
-#include "wsutil/wsgetopt.h"
+#  include "wsutil/wsgetopt.h"
+#else
+#  include <getopt.h>
 #endif
 
 #ifdef HAVE_LIBPORTAUDIO
-#include <portaudio.h>
+#  include <portaudio.h>
 #endif /* HAVE_LIBPORTAUDIO */
 
 #include <epan/epan.h>
@@ -87,27 +89,27 @@
 #include "ui/ui_util.h"
 
 #ifdef HAVE_LIBPCAP
-#include "capture_ui_utils.h"
-#include "capture-pcap-util.h"
-#include "capture_ifinfo.h"
-#include "capture.h"
-#include "capture_sync.h"
+#  include "capture_ui_utils.h"
+#  include "capture-pcap-util.h"
+#  include "capture_ifinfo.h"
+#  include "capture.h"
+#  include "capture_sync.h"
 #endif
 
 #ifdef _WIN32
-#include "capture-wpcap.h"
-#include "capture_wpcap_packet.h"
-#include <tchar.h> /* Needed for Unicode */
-#include <wsutil/unicode-utils.h>
-#include <commctrl.h>
-#include <shellapi.h>
+#  include "capture-wpcap.h"
+#  include "capture_wpcap_packet.h"
+#  include <tchar.h> /* Needed for Unicode */
+#  include <wsutil/unicode-utils.h>
+#  include <commctrl.h>
+#  include <shellapi.h>
 #endif /* _WIN32 */
 
 #ifdef HAVE_AIRPCAP
-#include <airpcap.h>
-#include "airpcap_loader.h"
-//#include "airpcap_dlg.h"
-//#include "airpcap_gui_utils.h"
+#  include <airpcap.h>
+#  include "airpcap_loader.h"
+//#  include "airpcap_dlg.h"
+//#  include "airpcap_gui_utils.h"
 #endif
 
 #include <epan/crypt/airpdcap_ws.h>