from albert chan
authorsahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 10 Nov 2005 21:52:55 +0000 (21:52 +0000)
committersahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 10 Nov 2005 21:52:55 +0000 (21:52 +0000)
dont use a variable with the name dirname since it will collide with symbols on some hosts

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16460 f5534014-38df-0310-8fa8-9805f1628bb7

epan/dtd_preparse.l

index 1d43095e7db8b11e5cdb3757ff00722fcc3b95bf..979d8625fffde8ff8e0624d4c970a9129b97cae5 100644 (file)
@@ -52,7 +52,7 @@ GHashTable* entities;
 gchar* entity_name;
 GString* error;
 
-const gchar* dirname;
+const gchar* dtd_dirname;
 const gchar* filename;
 guint linenum;
 
@@ -163,7 +163,7 @@ static gboolean free_gstring_hash_items(gpointer k,gpointer v,gpointer p _U_) {
 extern GString* dtd_preparse(const gchar* dname,const  gchar* fname, GString* err) {
        gchar* fullname = g_strdup_printf("%s%c%s",dname,G_DIR_SEPARATOR,fname);
     
-       dirname = dname;
+       dtd_dirname = dname;
        filename = fname;
        linenum = 1;