Include config.h first; it defines _FILE_OFFSET_BITS, and if some system

header later causes it to be redefined - as happens on my Solaris 11
virtual machine - we get a redefinition warning, which gets treated as
an error.

svn path=/trunk/; revision=51344

7 files changed, 15 insertions, 12 deletions

diff --git a/epan/wmem/wmem_allocator_simple.c b/epan/wmem/wmem_allocator_simple.c
index c08abb0dee..2a38d121e9 100644
--- a/epan/wmem/wmem_allocator_simple.c
+++ b/epan/wmem/wmem_allocator_simple.c
@@ -23,12 +23,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 #include <string.h>
 
 #include <glib.h>
 
-#include "config.h"
-
 #include "wmem_core.h"
 #include "wmem_allocator.h"
 
diff --git a/epan/wmem/wmem_allocator_strict.c b/epan/wmem/wmem_allocator_strict.c
index c83c2f6b40..a51b505c5f 100644
--- a/epan/wmem/wmem_allocator_strict.c
+++ b/epan/wmem/wmem_allocator_strict.c
@@ -23,12 +23,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 #include <string.h>
 
 #include <glib.h>
 
-#include "config.h"
-
 #include "wmem_core.h"
 #include "wmem_allocator.h"
 
diff --git a/epan/wmem/wmem_array.c b/epan/wmem/wmem_array.c
index 7004e995e4..4307a1c11c 100644
--- a/epan/wmem/wmem_array.c
+++ b/epan/wmem/wmem_array.c
@@ -23,12 +23,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
 
-#include "config.h"
-
 #include "wmem_core.h"
 #include "wmem_array.h"
 
diff --git a/epan/wmem/wmem_strbuf.c b/epan/wmem/wmem_strbuf.c
index 381cee9bdc..00062b6142 100644
--- a/epan/wmem/wmem_strbuf.c
+++ b/epan/wmem/wmem_strbuf.c
@@ -23,11 +23,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <glib.h>
 
-#include "config.h"
-
 #include "wmem_core.h"
 #include "wmem_strbuf.h"
 
diff --git a/epan/wmem/wmem_strutl.c b/epan/wmem/wmem_strutl.c
index b129d19ef7..4c4ae18bbf 100644
--- a/epan/wmem/wmem_strutl.c
+++ b/epan/wmem/wmem_strutl.c
@@ -23,13 +23,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdarg.h>
 
 #include <glib.h>
 
-#include "config.h"
-
 #include "wmem_core.h"
 #include "wmem_allocator.h"
 #include "wmem_strutl.h"
diff --git a/epan/wmem/wmem_test.c b/epan/wmem/wmem_test.c
index 6e577f3a32..366315d345 100644
--- a/epan/wmem/wmem_test.c
+++ b/epan/wmem/wmem_test.c
@@ -23,14 +23,16 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <glib.h>
+
 #include "wmem.h"
 #include "wmem_allocator.h"
 #include "wmem_allocator_block.h"
 #include "wmem_allocator_simple.h"
 #include "wmem_allocator_strict.h"
-#include "config.h"
 
 #define MAX_ALLOC_SIZE          (1024*64)
 #define MAX_SIMULTANEOUS_ALLOCS  1024
diff --git a/epan/wmem/wmem_tree.c b/epan/wmem/wmem_tree.c
index 037f4191e2..43116b0af5 100644
--- a/epan/wmem/wmem_tree.c
+++ b/epan/wmem/wmem_tree.c
@@ -24,12 +24,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>
 #include <glib.h>
 
-#include "config.h"
 #include "wmem_core.h"
 #include "wmem_tree.h"
 #include "wmem_user_cb.h"