diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-05-07 07:33:26 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-05-07 07:33:26 +0000 |
| commit | a7faef785ff8d7e7cfeb7c5d9a9303c4d40304f6 (patch) | |
| tree | a5853e3ebe0243f02f68d132f8fe3993a7f0a822 | |
| parent | 57f4b01fa931dccd3fce00b67e001d785276b7f1 (diff) | |
new attempt to resolve recent breakage
svn path=/trunk/; revision=21710
| -rw-r--r-- | wiretap/wtap-plugins.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/wiretap/wtap-plugins.c b/wiretap/wtap-plugins.c index 663140b7a2..1054ea1c32 100644 --- a/wiretap/wtap-plugins.c +++ b/wiretap/wtap-plugins.c @@ -20,18 +20,28 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + #ifdef HAVE_CONFIG_H #include "config.h" -#include "../config.h" #endif #include <glib.h> #include <gmodule.h> +/* Why do we check for these symbols here? we do not include any real + config.h so these symbols will never be true. +*/ #ifdef HAVE_DIRENT_H #include <dirent.h> #endif +/* Since config.h is broken */ +#if GLIB_MAJOR_VERSION < 2 +#ifndef DIR +#include <dirent.h> +#endif +#endif + #ifdef HAVE_DIRECT_H #include <direct.h> #endif @@ -54,6 +64,7 @@ static gboolean plugins_loaded = FALSE; void wtap_load_plugins(char* dirname) { #define FILENAME_LEN 1024 + ETH_DIR *dir; /* scanned directory */ ETH_DIRENT *file; /* current file */ const char *name; |