From 173fe5aef4167b9ad35fe514d05ef25fb66c076f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Fri, 2 Aug 2002 23:36:07 +0000 Subject: Replace the types from sys/types.h and netinet/in.h by their glib.h equivalents for the toplevel directory. The removal of winsock2.h will hopefully not cause any problems under MSVC++, as those files using struct timeval still include wtap.h, which still includes winsock2.h. svn path=/trunk/; revision=5932 --- asn1.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'asn1.h') diff --git a/asn1.h b/asn1.h index 949611e4b6..0dca046820 100644 --- a/asn1.h +++ b/asn1.h @@ -1,7 +1,7 @@ /* asn1.h * Definitions for ASN.1 BER dissection * - * $Id: asn1.h,v 1.8 2002/06/16 00:53:17 guy Exp $ + * $Id: asn1.h,v 1.9 2002/08/02 23:35:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -91,9 +91,9 @@ * typedef "subid_t". */ #if defined(HAVE_UCD_SNMP) -typedef u_long subid_t; /* UCD SNMP */ +typedef gulong subid_t; /* UCD SNMP */ #else -typedef u_int subid_t; /* CMU SNMP, libsmi, or nothing */ +typedef guint subid_t; /* CMU SNMP, libsmi, or nothing */ #endif #define ASN1_ERR_NOERROR 0 /* no error */ -- cgit v1.2.3