diff options
author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-01-15 00:23:13 +0000 |
---|---|---|
committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-01-15 00:23:13 +0000 |
commit | 339d67b043a1f1ac860b84ed48ec6ba77d96f487 (patch) | |
tree | 0ab0f799055b6e6bb48ddc02d21fa608874b4ee4 /gtk/main.h | |
parent | dbf3bf6177946f2e21efdb7a64ec32c8ee02eb74 (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 'gtk/main.h')
-rw-r--r-- | gtk/main.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/main.h b/gtk/main.h index eb3c2b0354..413d91fa2e 100644 --- a/gtk/main.h +++ b/gtk/main.h @@ -1,7 +1,7 @@ /* ethereal.h * Global defines, etc. * - * $Id: main.h,v 1.8 1999/12/10 06:28:23 guy Exp $ + * $Id: main.h,v 1.9 2000/01/15 00:22:52 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -64,7 +64,7 @@ void file_quit_cmd_cb(GtkWidget *, gpointer); void file_reload_cmd_cb(GtkWidget *, gpointer); void file_print_cmd_cb(GtkWidget *, gpointer); void file_print_packet_cmd_cb(GtkWidget *, gpointer); -#ifdef HAVE_DLFCN_H +#ifdef HAVE_PLUGINS void tools_plugins_cmd_cb(GtkWidget *, gpointer); #endif void expand_all_cb(GtkWidget *, gpointer); |