Fix bug in previous delta

[deliverable/binutils-gdb.git] / ld / deffile.h

diff --git a/ld/deffile.h b/ld/deffile.h
index 255739db8a931ccb9ec0457c640e85ea5fdcc9aa..e2c710da331494291a25cafaf4d463db9b0a9d6a 100644 (file)
--- a/ld/deffile.h
+++ b/ld/deffile.h
@@ -1,5 +1,5 @@
 /* deffile.h - header for .DEF file parser
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    Written by DJ Delorie dj@cygnus.com
 
    This file is part of GLD, the Gnu Linker.
@@ -19,6 +19,9 @@
    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
+#ifndef DEFFILE_H
+#define DEFFILE_H
+
 #include "ansidecl.h"
 
 /* DEF storage definitions.  Note that any ordinal may be zero, and
@@ -37,14 +40,23 @@ typedef struct def_file_export
     char *name;                        /* always set */
     char *internal_name;       /* always set, may == name */
     int ordinal;               /* -1 if not specified */
+    int hint;
     char flag_private, flag_constant, flag_noname, flag_data;
   }
 def_file_export;
 
+typedef struct def_file_module
+  {
+    struct def_file_module *next;
+    void *user_data;
+    char name[1]; /* extended via malloc */
+  }
+def_file_module;
+
 typedef struct def_file_import
   {
     char *internal_name;       /* always set */
-    char *module;              /* always set */
+    def_file_module *module;   /* always set */
     char *name;                        /* may be NULL; either this or ordinal will be set */
     int ordinal;               /* may be -1 */
   }
@@ -73,6 +85,9 @@ typedef struct def_file
     int num_exports;
     def_file_export *exports;
 
+    /* used by imports for module names */
+    def_file_module *modules;
+
     /* from the IMPORTS commands */
     int num_imports;
     def_file_import *imports;
@@ -101,11 +116,13 @@ extern def_file_import *def_file_add_import PARAMS ((def_file * _def,
                                                     int _ordinal,
                                               const char *_imported_name));
 
-extern int def_file_add_directive PARAMS ((def_file * _def,
-                                          const char *param,
-                                          int len));
+extern void def_file_add_directive PARAMS ((def_file * _def,
+                                           const char *param,
+                                           int len));
 
 #ifdef DEF_FILE_PRINT
 extern void def_file_print PARAMS ((FILE * _file,
                                    def_file * _def));
 #endif
+
+#endif /* DEFFILE_H */