diff options
| author | gram <gram@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-01-15 00:23:13 +0000 |
|---|---|---|
| committer | gram <gram@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-01-15 00:23:13 +0000 |
| commit | d4b22903404b2c56e789e9d2a2d9441ff12aff7c (patch) | |
| tree | 0ab0f799055b6e6bb48ddc02d21fa608874b4ee4 /asn1.c | |
| parent | 90e3924651e15be56566f7f25352625cf64f6966 (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1479 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1.c')
| -rw-r--r-- | asn1.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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" |