* hppa.h (pa_opcodes): Fix minor thinkos introduced while cleaning

[deliverable/binutils-gdb.git] / include / os9k.h

diff --git a/include/os9k.h b/include/os9k.h
index e3ea8ff8f6c2119fb980103fd6da3d57e9f1c83b..0f2eed2d3b1b1ddfa13b4a2ff671acc893fe4359 100644 (file)
--- a/include/os9k.h
+++ b/include/os9k.h
@@ -4,13 +4,6 @@
 /* OS-9000 i386 module header definitions */
 #define _MPF386
 
-#if 0
-/* These have name conflicts with Mach and don't appear to be used.  */
-typedef unsigned char u_int16[2];
-typedef unsigned char u_int32[4];
-typedef unsigned char owner_id[4];
-#endif
-
 /* sizeof common header less parity field */
 #define N_M_PARITY  (sizeof(mh_com)-sizeof(unisgned short))
 #define OLD_M_PARITY 46
@@ -82,45 +75,47 @@ typedef unsigned char owner_id[4];
 
 /* macro definitions for accessing module header fields */
 #define MODNAME(mod) ((u_char*)((u_char*)mod + ((Mh_com)mod)->m_name))
+#if 0
+/* Appears not to be used, and the u_int32 typedef is gone (because it
+   conflicted with a Mach header.  */
 #define MODSIZE(mod) ((u_int32)((Mh_com)mod)->m_size)
+#endif /* 0 */
 #define MHCOM_BYTES_SIZE 80
 #define N_BADMAG(a) (((a).a_info) != MODSYNC)
 
-#if 0
-/* These don't appear to be used.  */
 typedef struct mh_com {
-       u_int16
-               m_sync,                 /* sync bytes ($4afc)                                                           */
-               m_sysrev;               /* system revision check value                                          */
-       u_int32
-               m_size;                 /* module size                                                                          */
-       owner_id
-               m_owner;                /* group/user id                                                                        */
-       u_int32
-               m_name;                 /* offset to module name                                                        */
-       u_int16
-               m_access,               /* access permissions                                                           */
-               m_tylan,                /* type/lang                                                                            */
-               m_attrev,               /* rev/attr                                                                                     */
-               m_edit;                 /* edition                                                                                      */
-       u_int32
-               m_needs,                /* module hardware requirements flags. (reserved)       */
-               m_usage,                /* comment string offset                                                        */
-               m_symbol,               /* symbol table offset                                                          */
-               m_exec,                 /* offset to execution entry point                                      */
-               m_excpt,                /* offset to exception entry point                                      */
-               m_data,                 /* data storage requirement                                                     */
-               m_stack,                /* stack size                                                                           */
-               m_idata,                /* offset to initialized data                                           */
-               m_idref,                /* offset to data reference lists                                       */
-               m_init,                 /* initialization routine offset                                        */
-               m_term;                 /* termination routine offset                                           */
-       u_int16
-               m_ident;                /* ident code for ident program                                         */
-       char
-               m_spare[8];     /* reserved bytes                                                                       */
-       u_int16
-               m_parity;               /* header parity                                                                        */
+  /* sync bytes ($4afc).  */
+  unsigned char m_sync[2];
+  unsigned char m_sysrev[2];           /* system revision check value */
+  unsigned char
+    m_size[4];                 /* module size */
+  unsigned char
+    m_owner[4];                /* group/user id */
+  unsigned char
+    m_name[4];                 /* offset to module name */
+  unsigned char
+    m_access[2],               /* access permissions */
+    m_tylan[2],                /* type/lang */
+    m_attrev[2],               /* rev/attr */
+    m_edit[2];                 /* edition */
+  unsigned char
+    m_needs[4],                /* module hardware requirements flags. (reserved) */
+    m_usage[4],                /* comment string offset */
+    m_symbol[4],               /* symbol table offset */
+    m_exec[4],                 /* offset to execution entry point */
+    m_excpt[4],                /* offset to exception entry point */
+    m_data[4],                 /* data storage requirement */
+    m_stack[4],                /* stack size */
+    m_idata[4],                /* offset to initialized data */
+    m_idref[4],                /* offset to data reference lists */
+    m_init[4],                 /* initialization routine offset */
+    m_term[4];                 /* termination routine offset */
+  unsigned char
+    m_ident[2];                /* ident code for ident program */
+  char
+    m_spare[8];        /* reserved bytes */
+  unsigned char
+    m_parity[2];               /* header parity */
 } mh_com,*Mh_com;
 
 /* Executable memory module */
@@ -144,8 +139,6 @@ typedef     mh_com *Mh_dev,mh_dev;
 /* Configuration module */
 typedef mh_com *Mh_config, mh_config;
 
-#endif
-
 #if 0 
 
 #if !defined(_MODDIR_H)