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

1 files changed, 33 insertions, 56 deletions

diff --git a/config.h.win32 b/config.h.win32
index dbc4479a1f..5f620b6cd1 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -8,102 +8,79 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 /* #undef WORDS_BIGENDIAN */
 
-/* Define if lex declares yytext as a char * by default, not a char[].  */
-#define YYTEXT_POINTER 1
-
 /* #undef HAVE_SA_LEN */
 
 #define DATAFILE_DIR "/usr/local/etc"
-
-/* #undef NEED_INET_V6DEFS_H */
+#define PLUGIN_DIR "/usr/local/lib/ethereal/plugins/0.8"
 
 /* #undef NEED_SNPRINTF_H */
 
 /* #undef NEED_STRERROR_H */
 
-/* Define if you have the pcap library (-lpcap).  */
-/* #define HAVE_LIBPCAP 1 */	/* although there are versions available */
-
-/* #undef HAVE_LIBZ */		/* I think it might be available */
-
-/* Define if you have the gethostbyname2 function.  */
-/* #undef HAVE_GETHOSTBYNAME2 */
-
-/* Define if you have the getprotobynumber function.  */
-/* #undef HAVE_GETPROTOBYNUMBER */
-
-/* Define if you have the <dlfcn.h> header file.  */
-/* #undef HAVE_DLFCN_H */	/* XXX - use "LoadLibrary()"? */
+#define NEED_MKSTEMP 1
 
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H 1
 
-/* Define if you have the <net/if.h> header file.  */
-/* #undef HAVE_NET_IF_H */
-
-/* Define if you have the <netdb.h> header file.  */
-/* #undef HAVE_NETDB_H */
-
 /* Define if you have the <netinet/in.h> header file.  */
 /* #define HAVE_NETINET_IN_H 1 */
 
 /* Define if you have the <snmp/snmp.h> header file.  */
 /* #undef HAVE_SNMP_SNMP_H */
 
-/* Define if you have the <snmp/version.h> header file.  */
-/* #undef HAVE_SNMP_VERSION_H */
-
 /* Define if you have the <stdarg.h> header file.  */
 #define HAVE_STDARG_H 1
 
-/* Define if you have the <stddef.h> header file.  */
-/* #undef HAVE_STDDEF_H */
-
 /* Define if you have the <sys/ioctl.h> header file.  */
 /* #undef HAVE_SYS_IOCTL_H */
 
-/* Define if you have the <sys/socket.h> header file.  */
-/* #undef HAVE_SYS_SOCKET_H */
-
 /* Define if you have the <sys/sockio.h> header file.  */
 /* #undef HAVE_SYS_SOCKIO_H */
 
-/* Define if you have the <sys/stat.h> header file.  */
-/* #undef HAVE_SYS_STAT_H */
-
 /* Define if you have the <sys/time.h> header file.  */
 /* #define HAVE_SYS_TIME_H 1 */
+/* #undef HAVE_DIRENT_H 1 */
 
 /* Define if you have the <sys/types.h> header file.  */
 #define HAVE_SYS_TYPES_H 1
 
-/* Define if you have the <sys/wait.h> header file.  */
-/* #undef HAVE_SYS_WAIT_H */
-
 /* Define if you have the <ucd-snmp/snmp.h> header file.  */
 /* #undef HAVE_UCD_SNMP_SNMP_H */
 
-/* Define if you have the <ucd-snmp/version.h> header file.  */
-/* #undef HAVE_UCD_SNMP_VERSION_H */
-
 /* Define if you have the <unistd.h> header file.  */
 /* #define HAVE_UNISTD_H 1 */
 
+/* Define if you have the pcap library (-lpcap).  */
+/* #define HAVE_LIBPCAP 1 */
+
+/* Define if you have the z library (-lz).  */
+/*#define HAVE_LIBZ 1*/
+
 /* Name of package */
 #define PACKAGE "ethereal"
 
 /* Version number of package */
-#define VERSION "0.8.0"
-
-#define HAVE_WINSOCK_H          1
-#define HAVE_DIRECT_H           1
-#define HAVE_IO_H               1
-#define NEED_INET_V6DEFS_H      1
-#define snprintf                _snprintf
-#define vsnprintf               _vsnprintf
-#define strncasecmp             strnicmp
-#define open                    _open
-#define close                   _close
-#define popen                   _popen
-#define pclose                  _pclose
-
+#define VERSION "0.8.1"
+
+#ifndef WIN32
+#define WIN32			1
+#endif
+
+#define HAVE_WINDOWS_H		1
+#define HAVE_WINSOCK_H		1
+#define HAVE_DIRECT_H		1
+#define HAVE_IO_H		1
+#define NEED_INET_V6DEFS_H	1
+#define snprintf 		_snprintf
+#define vsnprintf 		_vsnprintf
+#define strncasecmp		strnicmp
+#define open			_open
+#define close			_close
+#define popen			_popen
+#define pclose			_pclose
+
+/* Needed for zlib, according to http://www.winimage.com/zLibDll/ */
+/*#define ZLIB_DLL                1
+#define _WINDOWS                1*/
+
+#define HAVE_PLUGINS		1