forked from osmocom/wireshark
Include ws_diag_control.h in config.h
Change-Id: Ia394071710ecda3b0e6686a51fbca45a8ff20317 Reviewed-on: https://code.wireshark.org/review/14749 Petri-Dish: João Valverde <j@v6e.pt> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
parent
be96c3d64c
commit
ecb4dc396e
|
@ -74,7 +74,6 @@
|
|||
#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>
|
||||
|
|
|
@ -44,7 +44,6 @@
|
|||
#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
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
* 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
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <config.h>
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
|
@ -30,7 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#include <glib/gstdio.h>
|
||||
|
||||
#include "ws80211_utils.h"
|
||||
#include "wsutil/ws_diag_control.h"
|
||||
|
||||
#if defined(HAVE_LIBNL) && defined(HAVE_NL80211)
|
||||
#include <string.h>
|
||||
|
|
|
@ -473,3 +473,5 @@
|
|||
|
||||
# define NEED_STRPTIME_H 1
|
||||
#endif
|
||||
|
||||
#include <ws_diag_control.h>
|
||||
|
|
|
@ -57,9 +57,7 @@
|
|||
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
|
||||
|
|
|
@ -260,3 +260,5 @@ typedef int ssize_t;
|
|||
|
||||
/* to use define _ws_mempbrk_sse42 if available (checked with cpuinfo) */
|
||||
#define HAVE_SSE4_2 1
|
||||
|
||||
#include <ws_diag_control.h>
|
||||
|
|
|
@ -3084,6 +3084,8 @@ AC_SUBST(WS_LDFLAGS)
|
|||
|
||||
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
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
usr/lib/*/libwsutil.so
|
||||
ws_symbol_export.h usr/include/wireshark
|
||||
ws_diag_control.h usr/include/wireshark
|
||||
wsutil/*.h usr/include/wireshark/wsutil
|
||||
|
|
|
@ -56,7 +56,6 @@
|
|||
|
||||
#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
|
||||
|
|
|
@ -83,7 +83,6 @@
|
|||
#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>
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
* information.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <config.h>
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
|
@ -64,7 +64,6 @@
|
|||
#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"
|
||||
|
|
|
@ -21,14 +21,11 @@
|
|||
* 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);
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@
|
|||
* information.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <config.h>
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
|
@ -72,7 +72,6 @@
|
|||
#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"
|
||||
|
@ -350,7 +349,7 @@ static int hf_kerberos_KDCOptions_renew = -1;
|
|||
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;
|
||||
|
@ -426,7 +425,7 @@ static gint ett_kerberos_KERB_PA_PAC_REQUEST = -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;
|
||||
|
@ -455,7 +454,7 @@ static gboolean gbl_do_col_info;
|
|||
#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)
|
||||
|
@ -4342,7 +4341,7 @@ dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
|
||||
/*--- 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
|
||||
|
@ -5396,7 +5395,7 @@ void proto_register_kerberos(void) {
|
|||
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 */
|
||||
|
@ -5474,7 +5473,7 @@ void proto_register_kerberos(void) {
|
|||
&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[] = {
|
||||
|
|
|
@ -18,13 +18,12 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#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)
|
||||
|
|
|
@ -27,9 +27,9 @@
|
|||
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;
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <config.h>
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
|
@ -40,8 +40,6 @@
|
|||
#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 {
|
||||
|
|
|
@ -49,7 +49,6 @@
|
|||
#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
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#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 */
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#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)
|
||||
|
|
|
@ -21,11 +21,12 @@
|
|||
* 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>
|
||||
|
|
|
@ -61,7 +61,6 @@
|
|||
#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>
|
||||
|
|
|
@ -42,7 +42,6 @@
|
|||
#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>
|
||||
|
||||
|
|
|
@ -112,7 +112,6 @@
|
|||
#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>
|
||||
|
||||
|
|
|
@ -52,7 +52,6 @@
|
|||
#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"
|
||||
|
|
1
tshark.c
1
tshark.c
|
@ -61,7 +61,6 @@
|
|||
#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>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
* 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>
|
||||
|
@ -59,7 +59,6 @@
|
|||
#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>
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#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/
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
#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>
|
||||
|
|
|
@ -39,13 +39,12 @@
|
|||
* 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
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <config.h>
|
||||
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
@ -34,7 +34,6 @@
|
|||
#include "file_wrappers.h"
|
||||
#include <wsutil/file_util.h>
|
||||
#include <wsutil/buffer.h>
|
||||
#include <wsutil/ws_diag_control.h>
|
||||
|
||||
#ifdef HAVE_PLUGINS
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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().
|
||||
|
@ -62,7 +62,6 @@
|
|||
#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 */
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <config.h>
|
||||
|
||||
#include "inet_addr-int.h"
|
||||
|
||||
|
@ -24,8 +24,6 @@
|
|||
|
||||
#include <glib.h>
|
||||
|
||||
#include <wsutil/ws_diag_control.h>
|
||||
|
||||
#ifndef __P
|
||||
#define __P(args) args
|
||||
#endif
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <config.h>
|
||||
|
||||
#include "inet_addr-int.h"
|
||||
|
||||
|
@ -24,8 +24,6 @@
|
|||
|
||||
#include <glib.h>
|
||||
|
||||
#include <wsutil/ws_diag_control.h>
|
||||
|
||||
#ifndef __P
|
||||
#define __P(args) args
|
||||
#endif
|
||||
|
|
|
@ -20,10 +20,9 @@
|
|||
* 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)
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
#ifdef HAVE_LIBGCRYPT
|
||||
|
||||
#include <wsutil/ws_diag_control.h>
|
||||
#include <ws_diag_control.h>
|
||||
|
||||
DIAG_OFF(deprecated-declarations)
|
||||
|
||||
|
|
Loading…
Reference in New Issue