rename OS and Architecture definition files for consistency

open-watcom · Oct 1, 2018 · f12f505 · f12f505
1 parent e52433f
commit f12f505
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/bld/dig/c/madman.c b/bld/dig/c/madman.c
@@ -208,7 +208,7 @@ mad_status      MADInit( void )
 #else
         #define pick_mad(enum,file,desc) {enum,file,desc},
 #endif
-        #include "madarch.h"
+        #include "digarch.h"
         #undef pick_mad
     };
 

diff --git a/bld/dig/h/madarch.h → bld/dig/h/digarch.h b/bld/dig/h/madarch.h → bld/dig/h/digarch.h
@@ -29,7 +29,7 @@
 ****************************************************************************/
 
 
-//          enum      file              desc
+//        enum      mad file        desc
 pick_mad( MAD_X86,  "madx86",       "Intel Architecture [80(x)86]" )
 pick_mad( MAD_X64,  "madx64",       "Intel Architecture [x64]" )
 pick_mad( MAD_AXP,  "madaxp",       "Alpha Architecture" )

diff --git a/bld/dig/h/mados.h → bld/dig/h/digos.h b/bld/dig/h/mados.h → bld/dig/h/digos.h
@@ -32,20 +32,20 @@
 // debugger internal variable dbg$os relate to this definition
 // don't change existing items value, only add new one after last
 
-//          enum           desc
-pick_mad( MAD_OS_IDUNNO,    "Unknown" )
-pick_mad( MAD_OS_DOS,       "DOS" )
-pick_mad( MAD_OS_OS2,       "OS/2" )
-pick_mad( MAD_OS_PHARLAP,   "Phar Lap 386 DOS Extender " )
-pick_mad( MAD_OS_ECLIPSE,   "Eclipse 386 DOS Extender" )
-pick_mad( MAD_OS_NW386,     "NetWare 386" )
-pick_mad( MAD_OS_QNX,       "QNX 4.x" )
-pick_mad( MAD_OS_RATIONAL,  "DOS/4G or compatible" )
-pick_mad( MAD_OS_WINDOWS,   "Windows 3.x" )
-pick_mad( MAD_OS_PENPOINT,  "PenPoint" )
-pick_mad( MAD_OS_NT,        "Win32" )
-pick_mad( MAD_OS_AUTOCAD,   "Autocad" )
-pick_mad( MAD_OS_NEUTRINO,  "QNX 6.x Neutrino" )
-pick_mad( MAD_OS_LINUX,     "Linux" )
-pick_mad( MAD_OS_FREEBSD,   "Free BSD" )
-pick_mad( MAD_OS_NT64,      "Win64" )
+//        enum          desc
+pick_mad( OS_IDUNNO,    "Unknown" )
+pick_mad( OS_DOS,       "DOS" )
+pick_mad( OS_OS2,       "OS/2" )
+pick_mad( OS_PHARLAP,   "Phar Lap 386 DOS Extender " )
+pick_mad( OS_ECLIPSE,   "Eclipse 386 DOS Extender" )
+pick_mad( OS_NW386,     "NetWare 386" )
+pick_mad( OS_QNX,       "QNX 4.x" )
+pick_mad( OS_RATIONAL,  "DOS/4G or compatible" )
+pick_mad( OS_WINDOWS,   "Windows 3.x" )
+pick_mad( OS_PENPOINT,  "PenPoint" )
+pick_mad( OS_NT,        "Win32" )
+pick_mad( OS_AUTOCAD,   "Autocad" )
+pick_mad( OS_NEUTRINO,  "QNX 6.x Neutrino" )
+pick_mad( OS_LINUX,     "Linux" )
+pick_mad( OS_FREEBSD,   "Free BSD" )
+pick_mad( OS_NT64,      "Win64" )
diff --git a/bld/dig/h/digtypes.h b/bld/dig/h/digtypes.h
@@ -387,14 +387,14 @@ typedef unsigned_8  dig_open; enum {
 enum archtypes {
     MAD_NIL,
     #define pick_mad(enum,file,desc) enum,
-    #include "madarch.h"
+    #include "digarch.h"
     #undef pick_mad
     MAD_MAX
 };
 
 enum ostypes {                  //NYI: redo these for PIL
-    #define pick_mad(enum,desc) enum,
-    #include "mados.h"
+    #define pick_mad(enum,desc) MAD_ ## enum,
+    #include "digos.h"
     #undef pick_mad
     MAD_OS_MAX
 };

diff --git a/bld/wv/utils/trap2txt/c/trap2txt.cpp b/bld/wv/utils/trap2txt/c/trap2txt.cpp
@@ -186,13 +186,13 @@ extern int SSD_Capabilities( int, unsigned char * , unsigned short );
 static char *mad_desc[] = {
     "Unknown",
 #define pick_mad(enum,file,desc) desc,
-#include "madarch.h"
+#include "digarch.h"
 #undef pick_mad
 };
 
 static char *mad_os_desc[] = {
 #define pick_mad(enum,desc) desc,
-#include "mados.h"
+#include "digos.h"
 #undef pick_mad
 };