2000-10-10 Kazu Hirata <kazu@hxi.com>

	* deffile.h: Fix formatting.
	* lexsup.c: Likewise.
	* mri.c: Likewise.

1 files changed, 59 insertions, 71 deletions

diff --git a/ld/deffile.h b/ld/deffile.h
index 92d76bac58..be6f486190 100644
--- a/ld/deffile.h
+++ b/ld/deffile.h
@@ -27,75 +27,64 @@
 /* DEF storage definitions.  Note that any ordinal may be zero, and
    any pointer may be NULL, if not defined by the DEF file.  */
 
-typedef struct def_file_section
-  {
-    char *name;			/* always set */
-    char *class;		/* may be NULL */
-    char flag_read, flag_write, flag_execute, flag_shared;
-  }
-def_file_section;
-
-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 */
-    def_file_module *module;	/* always set */
-    char *name;			/* may be NULL; either this or ordinal will be set */
-    int ordinal;		/* may be -1 */
-  }
-def_file_import;
-
-typedef struct def_file
-  {
-
-    /* from the NAME or LIBRARY command */
-    char *name;
-    int is_dll;			/* -1 if NAME/LIBRARY not given */
-    bfd_vma base_address;	/* (bfd_vma)(-1) if unspecified */
-
-    /* from the DESCRIPTION command */
-    char *description;
-
-    /* from the STACK/HEAP command, -1 if unspecified */
-    int stack_reserve, stack_commit;
-    int heap_reserve, heap_commit;
-
-    /* from the SECTION/SEGMENT commands */
-    int num_section_defs;
-    def_file_section *section_defs;
-
-    /* from the EXPORTS commands */
-    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;
-
-    /* from the VERSION command, -1 if not specified */
-    int version_major, version_minor;
-  }
-def_file;
+typedef struct def_file_section {
+  char *name;			/* always set */
+  char *class;			/* may be NULL */
+  char flag_read, flag_write, flag_execute, flag_shared;
+} def_file_section;
+
+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 */
+  def_file_module *module;	/* always set */
+  char *name;			/* may be NULL; either this or ordinal will be set */
+  int ordinal;			/* may be -1 */
+} def_file_import;
+
+typedef struct def_file {
+  /* from the NAME or LIBRARY command */
+  char *name;
+  int is_dll;			/* -1 if NAME/LIBRARY not given */
+  bfd_vma base_address;		/* (bfd_vma)(-1) if unspecified */
+
+  /* from the DESCRIPTION command */
+  char *description;
+
+  /* from the STACK/HEAP command, -1 if unspecified */
+  int stack_reserve, stack_commit;
+  int heap_reserve, heap_commit;
+
+  /* from the SECTION/SEGMENT commands */
+  int num_section_defs;
+  def_file_section *section_defs;
+
+  /* from the EXPORTS commands */
+  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;
+
+  /* from the VERSION command, -1 if not specified */
+  int version_major, version_minor;
+} def_file;
 
 extern def_file *def_file_empty PARAMS ((void));
 
@@ -121,8 +110,7 @@ extern void def_file_add_directive PARAMS ((def_file * _def,
 					    int len));
 
 #ifdef DEF_FILE_PRINT
-extern void def_file_print PARAMS ((FILE * _file,
-				    def_file * _def));
+extern void def_file_print PARAMS ((FILE * _file, def_file * _def));
 #endif
 
 #endif /* DEFFILE_H */