aboutsummaryrefslogtreecommitdiffstats
path: root/asn1.c
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2000-01-15 00:23:13 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2000-01-15 00:23:13 +0000
commit339d67b043a1f1ac860b84ed48ec6ba77d96f487 (patch)
tree0ab0f799055b6e6bb48ddc02d21fa608874b4ee4 /asn1.c
parentdbf3bf6177946f2e21efdb7a64ec32c8ee02eb74 (diff)
Merge in the final code to make Ethereal run on Win32, compiled
with MSVC 6.0 and 'nmake', the make tool that comes with MSVC. It compiles, links, and runs. It doesn't run correctly. There's a problem when reading files. I'm getting short reads. I'm not linking in zlib or libsnmp because it first needs to be debugged. I changed the plugin code to use gmodule instead of libltdl, but the Unix build still links ethereal against libltdl. I'll fix that tonight; sorry about leaving it in such a sad state, but I wanted to check in this code before I left work on a Friday night. Ethereal still works, but the building is less than optimal. svn path=/trunk/; revision=1479
Diffstat (limited to 'asn1.c')
-rw-r--r--asn1.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/asn1.c b/asn1.c
index 28e7bfccce..fc913ebf3d 100644
--- a/asn1.c
+++ b/asn1.c
@@ -1,7 +1,7 @@
/* asn1.c
* Routines for ASN.1 BER dissection
*
- * $Id: asn1.c,v 1.2 1999/12/10 09:49:26 guy Exp $
+ * $Id: asn1.c,v 1.3 2000/01/15 00:22:29 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -65,6 +65,10 @@
# include <sys/types.h>
#endif
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+
#include <glib.h>
#include "asn1.h"