#include <wsutil/crash_info.h>
#include <wsutil/filesystem.h>
#include <wsutil/privileges.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#include <wiretap/wtap_opttypes.h>
#include <wiretap/pcapng.h>
#include <wsutil/file_util.h>
#include <wsutil/filesystem.h>
#include <wsutil/privileges.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#ifdef HAVE_PLUGINS
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
-#include "wsutil/ws_diag_control.h"
+
+#include <config.h>
#ifdef HAVE_LIBPCAP
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <glib/gstdio.h>
#include "ws80211_utils.h"
-#include "wsutil/ws_diag_control.h"
#if defined(HAVE_LIBNL) && defined(HAVE_NL80211)
#include <string.h>
# define NEED_STRPTIME_H 1
#endif
+
+#include <ws_diag_control.h>
The latter both reduces CPU time and makes the algorithm more SIMD-friendly.
*/
-#include "config.h"
-
-#include "wsutil/ws_diag_control.h"
+#include <config.h>
#define OUTSIDE_SPEEX 1
#define FLOATING_POINT 1
/* to use define _ws_mempbrk_sse42 if available (checked with cpuinfo) */
#define HAVE_SSE4_2 1
+
+#include <ws_diag_control.h>
AC_SUBST(WS_CFLAGS_FOR_BUILD)
+AH_BOTTOM([#include <ws_diag_control.h>])
+
dnl Save the cacheable configure results to config.cache before recursing
AC_CACHE_SAVE
usr/lib/*/libwsutil.so
ws_symbol_export.h usr/include/wireshark
+ws_diag_control.h usr/include/wireshark
wsutil/*.h usr/include/wireshark/wsutil
#include <wsutil/cmdarg_err.h>
#include <wsutil/crash_info.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#ifndef HAVE_GETOPT_LONG
#include <wsutil/report_err.h>
#include <wsutil/strnatcmp.h>
#include <wsutil/str_util.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#include <wsutil/pint.h>
#include <wiretap/wtap_opttypes.h>
* information.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <epan/expert.h>
#include <epan/prefs.h>
#include <wsutil/file_util.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/str_util.h>
#include "packet-kerberos.h"
#include "packet-netbios.h"
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
-
+#include <config.h>
#include <epan/packet.h>
#include <epan/prefs.h>
-#include <wsutil/ws_diag_control.h>
-
void proto_register_asterix(void);
void proto_reg_handoff_asterix(void);
* information.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <epan/expert.h>
#include <epan/prefs.h>
#include <wsutil/file_util.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/str_util.h>
#include "packet-kerberos.h"
#include "packet-netbios.h"
static int hf_kerberos_KDCOptions_validate = -1;
/*--- End of included file: packet-kerberos-hf.c ---*/
-#line 173 "./asn1/kerberos/packet-kerberos-template.c"
+#line 172 "./asn1/kerberos/packet-kerberos-template.c"
/* Initialize the subtree pointers */
static gint ett_kerberos = -1;
static gint ett_kerberos_ChangePasswdData = -1;
/*--- End of included file: packet-kerberos-ett.c ---*/
-#line 187 "./asn1/kerberos/packet-kerberos-template.c"
+#line 186 "./asn1/kerberos/packet-kerberos-template.c"
static expert_field ei_kerberos_decrypted_keytype = EI_INIT;
static expert_field ei_kerberos_address = EI_INIT;
#define KERBEROS_ADDR_TYPE_IPV6 24
/*--- End of included file: packet-kerberos-val.h ---*/
-#line 200 "./asn1/kerberos/packet-kerberos-template.c"
+#line 199 "./asn1/kerberos/packet-kerberos-template.c"
static void
call_kerberos_callbacks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int tag, kerberos_callbacks *cb)
/*--- End of included file: packet-kerberos-fn.c ---*/
-#line 1986 "./asn1/kerberos/packet-kerberos-template.c"
+#line 1985 "./asn1/kerberos/packet-kerberos-template.c"
/* Make wrappers around exported functions for now */
int
NULL, HFILL }},
/*--- End of included file: packet-kerberos-hfarr.c ---*/
-#line 2367 "./asn1/kerberos/packet-kerberos-template.c"
+#line 2366 "./asn1/kerberos/packet-kerberos-template.c"
};
/* List of subtrees */
&ett_kerberos_ChangePasswdData,
/*--- End of included file: packet-kerberos-ettarr.c ---*/
-#line 2383 "./asn1/kerberos/packet-kerberos-template.c"
+#line 2382 "./asn1/kerberos/packet-kerberos-template.c"
};
static ei_register_info ei[] = {
*
*/
+#include <config.h>
+
#include <stdio.h>
#include <glib.h>
-#include <config.h>
#include "exceptions.h"
-#include <wsutil/ws_diag_control.h>
-
gboolean failed = FALSE;
DIAG_OFF(shadow)
extern "C" {
#endif /* __cplusplus */
+#include <ws_diag_control.h>
+#include <ws_symbol_export.h>
#include <wsutil/nstime.h>
-#include <wsutil/ws_diag_control.h>
-#include "ws_symbol_export.h"
struct _packet_info;
struct epan_session;
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <epan/dfilter/dfilter.h>
#include <epan/tap.h>
-#include <wsutil/ws_diag_control.h>
-
static gboolean tapping_is_active=FALSE;
typedef struct _tap_dissector_t {
#include <wsutil/file_util.h>
#include <wsutil/privileges.h>
#include <wsutil/strnatcmp.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#ifdef HAVE_PLUGINS
#ifndef _PACKET_ECATMAILBOX_H_
#define _PACKET_ECATMAILBOX_H_
-#include <wsutil/ws_diag_control.h>
+#include <ws_diag_control.h>
DIAG_OFF(pedantic)
/* Ensure the same data layout for all platforms */
#ifndef _PACKET_ETHERCAT_FRAME_H
#define _PACKET_ETHERCAT_FRAME_H
-#include <wsutil/ws_diag_control.h>
+#include <ws_diag_control.h>
/* structure for decoding the header -----------------------------------------*/
DIAG_OFF(pedantic)
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include <config.h>
+
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/unicode-utils.h>
#include <wsutil/file_util.h>
#include <wsutil/filesystem.h>
#include <wsutil/plugins.h>
#include <wsutil/privileges.h>
#include <wsutil/report_err.h>
-#include <wsutil/ws_diag_control.h>
#include "globals.h"
#include <epan/packet.h>
#include <wsutil/filesystem.h>
#include <wsutil/file_util.h>
#include <wsutil/privileges.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#include <wiretap/wtap_opttypes.h>
#include <string.h>
#include <wsutil/file_util.h>
#include <wsutil/crash_info.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#include <wsutil/inet_addr.h>
#include <wsutil/file_util.h>
#include <wsutil/privileges.h>
#include <wsutil/report_err.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#include "globals.h"
#include <wsutil/file_util.h>
#include <wsutil/privileges.h>
#include <wsutil/report_err.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#include <wiretap/wtap_opttypes.h>
#include <wiretap/pcapng.h>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
+#include <config.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <wsutil/file_util.h>
#include <wsutil/privileges.h>
#include <wsutil/report_err.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#include <wiretap/merge.h>
#ifndef __TANGO_COLORS_H__
#define __TANGO_COLORS_H__
-#include <wsutil/ws_diag_control.h>
+#include <ws_diag_control.h>
// http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
// with added hues from http://emilis.info/other/extended_tango/
#endif
#include <wsutil/report_err.h>
#include <wsutil/unicode-utils.h>
-#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#include <epan/addr_resolv.h>
* 3. This notice may not be removed or altered from any source distribution.
*/
-#include "config.h"
+#include <config.h>
#include <errno.h>
#include <string.h>
#include "wtap-int.h"
#include "file_wrappers.h"
-#include <wsutil/ws_diag_control.h>
#include <wsutil/file_util.h>
#ifdef HAVE_ZLIB
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "config.h"
+#include <config.h>
#include <string.h>
#include <errno.h>
#include "file_wrappers.h"
#include <wsutil/file_util.h>
#include <wsutil/buffer.h>
-#include <wsutil/ws_diag_control.h>
#ifdef HAVE_PLUGINS
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
+#include <config.h>
/*
* Required with GNU libc to get dladdr().
#include <wsutil/report_err.h>
#include <wsutil/privileges.h>
#include <wsutil/file_util.h>
-#include <wsutil/ws_diag_control.h>
#include <wiretap/wtap.h> /* for WTAP_ERR_SHORT_WRITE */
* SOFTWARE.
*/
-#include "config.h"
+#include <config.h>
#include "inet_addr-int.h"
#include <glib.h>
-#include <wsutil/ws_diag_control.h>
-
#ifndef __P
#define __P(args) args
#endif
* SOFTWARE.
*/
-#include "config.h"
+#include <config.h>
#include "inet_addr-int.h"
#include <glib.h>
-#include <wsutil/ws_diag_control.h>
-
#ifndef __P
#define __P(args) args
#endif
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
+#include <config.h>
#include "str_util.h"
-#include "ws_diag_control.h"
int
ws_xton(char ch)
#ifdef HAVE_LIBGCRYPT
-#include <wsutil/ws_diag_control.h>
+#include <ws_diag_control.h>
DIAG_OFF(deprecated-declarations)