standard beginning of all source files ...

... according to comments in impexp.h.
SDL-Hercules-390 · Mar 8, 2018 · 771dcca · 771dcca
1 parent a0b70fd
commit 771dcca
Show file tree

Hide file tree

Showing 66 changed files with 67 additions and 356 deletions.
diff --git a/archlvl.c b/archlvl.c
@@ -7,13 +7,8 @@
 
 #include "hstdinc.h"
 
-#if !defined(_ARCHLVL_C_)
 #define _ARCHLVL_C_
-#endif
-
-#if !defined(_HENGINE_DLL_)
 #define _HENGINE_DLL_
-#endif
 
 #include "hercules.h"
 #include "devtype.h"

diff --git a/assist.c b/assist.c
@@ -20,13 +20,8 @@
 
 #include "hstdinc.h"
 
-#if !defined(_HENGINE_DLL_)
-#define _HENGINE_DLL_
-#endif
-
-#if !defined(_ASSIST_C_)
 #define _ASSIST_C_
-#endif
+#define _HENGINE_DLL_
 
 #include "hercules.h"
 #include "opcode.h"

diff --git a/bldcfg.c b/bldcfg.c
@@ -36,13 +36,8 @@
 
 #include "hstdinc.h"
 
-#ifndef _BLDCFG_C_
 #define _BLDCFG_C_
-#endif
-
-#ifndef _HENGINE_DLL_
 #define _HENGINE_DLL_
-#endif
 
 #include "hercules.h"
 #include "devtype.h"

diff --git a/cckddasd.c b/cckddasd.c
@@ -16,6 +16,7 @@
 
 #define _CCKDDASD_C_
 #define _HDASD_DLL_
+
 #include "hercules.h"
 #include "devtype.h"
 #include "opcode.h"

diff --git a/chsc.c b/chsc.c
@@ -15,13 +15,8 @@
 
 #include "hstdinc.h"
 
-#if !defined(_HENGINE_DLL_)
-#define _HENGINE_DLL_
-#endif
-
-#if !defined(_CHSC_C_)
 #define _CHSC_C_
-#endif
+#define _HENGINE_DLL_
 
 #include "hercules.h"
 #include "opcode.h"

diff --git a/clock.c b/clock.c
@@ -55,20 +55,18 @@
 
 DISABLE_GCC_WARNING( "-Wunused-function" )
 
-#if !defined(_HENGINE_DLL_)
+#define _CLOCK_C_
 #define _HENGINE_DLL_
-#endif
 
 #include "hercules.h"
 #include "opcode.h"
 #include "inline.h"
 #include "sr.h"
-
-#if !defined(_CLOCK_C_)
-#define _CLOCK_C_
-
 #include "clock.h"
 
+#ifndef COMPILE_THIS_ONLY_ONCE
+#define COMPILE_THIS_ONLY_ONCE
+
 
 /*----------------------------------------------------------------------------*/
 /* host_ETOD - Primary high-resolution clock fetch and conversion             */
@@ -1073,8 +1071,7 @@ int clock_hresume(void *file)
     return 0;
 }
 
-
-#endif
+#endif // COMPILE_THIS_ONLY_ONCE
 
 
 #if defined(FEATURE_INTERVAL_TIMER)

diff --git a/cmdtab.c b/cmdtab.c
@@ -11,13 +11,8 @@
 
 #include "hstdinc.h"
 
-#ifndef _CMDTAB_C_
 #define _CMDTAB_C_
-#endif
-
-#ifndef _HENGINE_DLL_
 #define _HENGINE_DLL_
-#endif
 
 #include "hercules.h"
 #include "history.h"

diff --git a/cmpsc_2012.c b/cmpsc_2012.c
@@ -44,9 +44,8 @@
 
 DISABLE_GCC_WARNING( "-Wunused-function" )
 
-#if !defined(_HENGINE_DLL_)
+#define _CMPSC_C_
 #define _HENGINE_DLL_
-#endif
 
 #if !defined( NOT_HERC )                          // (building Hercules?)
 #include "hercules.h"

diff --git a/cmpscdbg.c b/cmpscdbg.c
@@ -7,13 +7,8 @@
 
 #include "hstdinc.h"    // (MUST be first #include in EVERY source file)
 
-#if !defined(_HENGINE_DLL_)
-#define _HENGINE_DLL_
-#endif
-
-#if !defined(_CMPSCDBG_C_)
 #define _CMPSCDBG_C_
-#endif
+#define _HENGINE_DLL_
 
 #if !defined( NOT_HERC )        // (building Hercules?)
 #include "hercules.h"

diff --git a/cmpscdct.c b/cmpscdct.c
@@ -7,13 +7,8 @@
 
 #include "hstdinc.h"    // (MUST be first #include in EVERY source file)
 
-#if !defined(_HENGINE_DLL_)
-#define _HENGINE_DLL_
-#endif
-
-#if !defined(_CMPSCDCT_C_)
 #define _CMPSCDCT_C_
-#endif
+#define _HENGINE_DLL_
 
 #if !defined( NOT_HERC )        // (building Hercules?)
 #include "hercules.h"

diff --git a/cmpscget.c b/cmpscget.c
@@ -7,13 +7,8 @@
 
 #include "hstdinc.h"    // (MUST be first #include in EVERY source file)
 
-#if !defined(_HENGINE_DLL_)
-#define _HENGINE_DLL_
-#endif
-
-#if !defined(_CMPSCGET_C_)
 #define _CMPSCGET_C_
-#endif
+#define _HENGINE_DLL_
 
 #if !defined( NOT_HERC )        // (building Hercules?)
 #include "hercules.h"

diff --git a/cmpscmem.c b/cmpscmem.c
@@ -7,13 +7,8 @@
 
 #include "hstdinc.h"    // (MUST be first #include in EVERY source file)
 
-#if !defined(_HENGINE_DLL_)
-#define _HENGINE_DLL_
-#endif
-
-#if !defined(_CMPSCMEM_C_)
 #define _CMPSCMEM_C_
-#endif
+#define _HENGINE_DLL_
 
 #if !defined( NOT_HERC )        // (building Hercules?)
 #include "hercules.h"

diff --git a/cmpscput.c b/cmpscput.c
@@ -7,13 +7,8 @@
 
 #include "hstdinc.h"    // (MUST be first #include in EVERY source file)
 
-#if !defined(_HENGINE_DLL_)
-#define _HENGINE_DLL_
-#endif
-
-#if !defined(_CMPSCPUT_C_)
 #define _CMPSCPUT_C_
-#endif
+#define _HENGINE_DLL_
 
 #if !defined( NOT_HERC )        // (building Hercules?)
 #include "hercules.h"

diff --git a/config.c b/config.c
@@ -13,13 +13,8 @@
 
 DISABLE_GCC_WARNING( "-Wunused-function" )
 
-#ifndef _CONFIG_C_
 #define _CONFIG_C_
-#endif
-
-#ifndef _HENGINE_DLL_
 #define _HENGINE_DLL_
-#endif
 
 #include "hercules.h"
 #include "opcode.h"

diff --git a/control.c b/control.c
@@ -36,13 +36,8 @@
 
 #include "hstdinc.h"
 
-#if !defined(_HENGINE_DLL_)
-#define _HENGINE_DLL_
-#endif
-
-#if !defined(_CONTROL_C_)
 #define _CONTROL_C_
-#endif
+#define _HENGINE_DLL_
 
 #include "hercules.h"
 #include "opcode.h"

diff --git a/cpu.c b/cpu.c
@@ -34,13 +34,8 @@
 
 #include "hstdinc.h"
 
-#if !defined(_HENGINE_DLL_)
-#define _HENGINE_DLL_
-#endif
-
-#if !defined(_CPU_C_)
 #define _CPU_C_
-#endif
+#define _HENGINE_DLL_
 
 #include "hercules.h"
 #include "opcode.h"

diff --git a/crypto.c b/crypto.c
@@ -8,17 +8,9 @@
 #include "hstdinc.h"
 
 #define _CRYPTO_C_
-
-#include "hercules.h"
-
-#ifndef _HENGINE_DLL_
 #define _HENGINE_DLL_
-#endif
-
-#ifndef _CRYPTO_C_
-#define _CRYPTO_C_
-#endif
 
+#include "hercules.h"
 #include "opcode.h"
 
 //efine    WRAPPINGKEYS_DEBUG       // (#define for debugging)

diff --git a/ctcadpt.c b/ctcadpt.c
@@ -27,7 +27,6 @@
 #include "hercules.h"
 #include "devtype.h"
 #include "ctcadpt.h"
-
 #include "opcode.h"
 #include "devtype.h"
 

diff --git a/decimal.c b/decimal.c
@@ -28,18 +28,11 @@
 
 #include "hstdinc.h"
 
-#if !defined(_HENGINE_DLL_)
-#define _HENGINE_DLL_
-#endif
-
-#if !defined(_DECIMAL_C_)
 #define _DECIMAL_C_
-#endif
+#define _HENGINE_DLL_
 
 #include "hercules.h"
-
 #include "opcode.h"
-
 #include "inline.h"
 
 #if !defined(_DECIMAL_C)

diff --git a/diagmssf.c b/diagmssf.c
@@ -17,20 +17,12 @@
 
 #include "hstdinc.h"
 
-#if !defined(_HENGINE_DLL_)
-#define _HENGINE_DLL_
-#endif
-
-#if !defined(_DIAGMSSF_C_)
 #define _DIAGMSSF_C_
-#endif
+#define _HENGINE_DLL_
 
 #include "hercules.h"
-
 #include "opcode.h"
-
 #include "inline.h"
-
 #include "service.h"
 
 #if !defined(_DIAGMSSF_C)

diff --git a/diagnose.c b/diagnose.c
@@ -19,20 +19,15 @@
 
 #include "hstdinc.h"
 
-#ifndef _HENGINE_DLL_
-#define _HENGINE_DLL_
-#endif
-
-#ifndef _DIAGNOSE_C_
 #define _DIAGNOSE_C_
-#endif
+#define _HENGINE_DLL_
 
 #include "hercules.h"
 #include "opcode.h"
 #include "inline.h"
 
-#ifndef _DIAGNOSE_H
-#define _DIAGNOSE_H
+#ifndef COMPILE_THIS_ONLY_ONCE
+#define COMPILE_THIS_ONLY_ONCE
 
 /*-------------------------------------------------------------------*/
 /* Internal macro definitions                                        */
@@ -47,7 +42,7 @@
 /* Diagnose 308 return codes */
 #define DIAG308_RC_OK           1
 
-#endif // _DIAGNOSE_H
+#endif // COMPILE_THIS_ONLY_ONCE
 
 #ifndef STOP_CPUS_AND_IPL
 #define STOP_CPUS_AND_IPL

diff --git a/dyncrypt.c b/dyncrypt.c
@@ -17,13 +17,8 @@
 
 #include "hstdinc.h"
 
-#ifndef _DYNCRYPT_C_
 #define _DYNCRYPT_C_
-#endif /* #ifndef _DYNCRYPT_C_ */
-
-#ifndef _DYNCRYPT_DLL_
 #define _DYNCRYPT_DLL_
-#endif /* #ifndef _DYNCRYPT_DLL_ */
 
 #include "hercules.h"
 #include "opcode.h"

diff --git a/ecpsvm.c b/ecpsvm.c
@@ -164,13 +164,8 @@
 
 #include "hstdinc.h"
 
-#if !defined(_HENGINE_DLL_)
-#define _HENGINE_DLL_
-#endif
-
-#if !defined(_ECPSVM_C_)
 #define _ECPSVM_C_
-#endif
+#define _HENGINE_DLL_
 
 #include "hercules.h"
 #include "opcode.h"

diff --git a/esame.c b/esame.c
@@ -23,13 +23,8 @@
 
 #include "hstdinc.h"
 
-#if !defined(_HENGINE_DLL_)
-#define _HENGINE_DLL_
-#endif
-
-#if !defined(_ESAME_C_)
 #define _ESAME_C_
-#endif
+#define _HENGINE_DLL_
 
 #include "hercules.h"
 #include "opcode.h"