"prefs-int.h" belongs in epan, too.

svn path=/trunk/; revision=12168

Makefile.common

@@ -44,7 +44,6 @@ DISSECTOR_SUPPORT_INCLUDES =	\
 	nlpid.h	\
 	oui.h	\
 	ppptypes.h	\
-	prefs-int.h	\
 	ptvcursor.h	\
 	reassemble.h	\
 	rpc_defrag.h	\

epan/Makefile.common

@@ -107,6 +107,7 @@ LIBETHEREAL_INCLUDES = 		\
 	pint.h			\
 	plugins.h		\
 	prefs.h			\
+	prefs-int.h		\
 	proto.h			\
 	range.h			\
 	report_err.h		\

epan/prefs.c

@@ -45,7 +45,7 @@
 #include <epan/column.h>
 #include "print.h"
 
-#include "prefs-int.h"
+#include <epan/prefs-int.h>
 
 /* Internal functions */
 static module_t *find_module(const char *name);

gtk/main.c

@@ -93,7 +93,7 @@
 #include "print.h"
 #include "simple_dialog.h"
 #include "register.h"
-#include "prefs-int.h"
+#include <epan/prefs-int.h>
 #include "ringbuffer.h"
 #include "../ui_util.h"     /* beware: ui_util.h exists twice! */
 #include <epan/tap.h>

gtk/prefs_dlg.c

@@ -50,7 +50,7 @@
 #include "simple_dialog.h"
 #include "compat_macros.h"
 
-#include "prefs-int.h"
+#include <epan/prefs-int.h>
 
 #ifdef HAVE_LIBPCAP
 #ifdef _WIN32

gtk/recent.c

@@ -37,7 +37,7 @@
 #include "menu.h"
 #include "main.h"
 #include <epan/prefs.h>
-#include "prefs-int.h"
+#include <epan/prefs-int.h>
 #include "ui_util.h"
 #include "dlg_utils.h"
 #include "cfilter_combo_utils.h"