From d5ca542102202a9f69d91a42de303d4dc0ecca74 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Tue, 12 Mar 2013 11:07:58 -0700 Subject: [PATCH] Changed use of compile #defines which start with a _ character to not do this since defined symbols starting with _ are reserved to local compiler/runtime implementations in the C language. This addresses issue #32 --- GRI/gri_defs.h | 4 ++-- H316/h316_defs.h | 4 ++-- HP2100/hp2100_cpu.h | 4 ++-- HP2100/hp2100_cpu1.h | 4 ++-- HP2100/hp2100_defs.h | 4 ++-- HP2100/hp2100_fp.h | 4 ++-- HP2100/hp2100_fp1.h | 4 ++-- I1401/i1401_defs.h | 4 ++-- I1620/i1620_defs.h | 4 ++-- I7094/i7094_defs.h | 4 ++-- Interdata/id_defs.h | 4 ++-- LGP/lgp_defs.h | 4 ++-- NOVA/nova_defs.h | 4 ++-- PDP1/pdp1_defs.h | 4 ++-- PDP10/pdp10_defs.h | 4 ++-- PDP11/pdp11_cpumod.h | 4 ++-- PDP11/pdp11_defs.h | 4 ++-- PDP11/pdp11_dmc.h | 4 ++-- PDP11/pdp11_io_lib.h | 4 ++-- PDP11/pdp11_mscp.h | 4 ++-- PDP11/pdp11_uqssp.h | 4 ++-- PDP11/pdp11_xq.h | 4 ++-- PDP11/pdp11_xq_bootrom.h | 4 ++-- PDP11/pdp11_xu.h | 4 ++-- PDP18B/pdp18b_defs.h | 4 ++-- PDP8/pdp8_defs.h | 4 ++-- SDS/sds_defs.h | 4 ++-- TX-0/tx0_defs.h | 4 ++-- VAX/vax610_defs.h | 4 ++-- VAX/vax630_defs.h | 4 ++-- VAX/vax730_defs.h | 4 ++-- VAX/vax750_defs.h | 4 ++-- VAX/vax780_defs.h | 4 ++-- VAX/vax860_defs.h | 4 ++-- VAX/vax_defs.h | 4 ++-- VAX/vaxmod_defs.h | 4 ++-- alpha/alpha_defs.h | 4 ++-- alpha/alpha_ev5_defs.h | 4 ++-- alpha/alpha_sys_defs.h | 4 ++-- alpha/old_pal/alpha_pal_defs.h | 4 ++-- display/vt11.h | 4 ++-- scp.c | 20 ++++++++++---------- scp.h | 4 ++-- sigma/sigma_defs.h | 4 ++-- sigma/sigma_io_defs.h | 4 ++-- sim_console.h | 4 ++-- sim_defs.h | 4 ++-- sim_disk.c | 6 +++--- sim_disk.h | 4 ++-- sim_ether.h | 4 ++-- sim_fio.c | 16 ++++++++-------- sim_fio.h | 4 ++-- sim_rev.h | 4 ++-- sim_serial.h | 10 +++++----- sim_sock.h | 4 ++-- sim_tape.h | 4 ++-- sim_timer.h | 4 ++-- sim_tmxr.h | 8 ++++---- 58 files changed, 136 insertions(+), 136 deletions(-) diff --git a/GRI/gri_defs.h b/GRI/gri_defs.h index 034d3337..0f199c33 100644 --- a/GRI/gri_defs.h +++ b/GRI/gri_defs.h @@ -47,8 +47,8 @@ 5. How does the EAO handle divide overflow? Answer: set link. */ -#ifndef _GRI_DEFS_H_ -#define _GRI_DEFS_H_ 0 +#ifndef GRI_DEFS_H_ +#define GRI_DEFS_H_ 0 #include "sim_defs.h" /* simulator defns */ diff --git a/H316/h316_defs.h b/H316/h316_defs.h index d647742a..24203a13 100644 --- a/H316/h316_defs.h +++ b/H316/h316_defs.h @@ -31,8 +31,8 @@ 25-Apr-03 RMS Revised for extended file support */ -#ifndef _H316_DEFS_H_ -#define _H316_DEFS_H_ 0 +#ifndef H316_DEFS_H_ +#define H316_DEFS_H_ 0 #include "sim_defs.h" /* simulator defns */ diff --git a/HP2100/hp2100_cpu.h b/HP2100/hp2100_cpu.h index 4e0db47e..395aa6e1 100644 --- a/HP2100/hp2100_cpu.h +++ b/HP2100/hp2100_cpu.h @@ -46,8 +46,8 @@ encode the series within the type. */ -#ifndef _HP2100_CPU_H_ -#define _HP2100_CPU_H_ 0 +#ifndef HP2100_CPU_H_ +#define HP2100_CPU_H_ 0 #include diff --git a/HP2100/hp2100_cpu1.h b/HP2100/hp2100_cpu1.h index 52b6a8c5..1e7de675 100644 --- a/HP2100/hp2100_cpu1.h +++ b/HP2100/hp2100_cpu1.h @@ -33,8 +33,8 @@ 26-Sep-06 JDB Split from hp2100_cpu1.c */ -#ifndef _HP2100_CPU1_H_ -#define _HP2100_CPU1_H_ +#ifndef HP2100_CPU1_H_ +#define HP2100_CPU1_H_ /* Register print encoding */ diff --git a/HP2100/hp2100_defs.h b/HP2100/hp2100_defs.h index 3c969c9f..a708a88a 100644 --- a/HP2100/hp2100_defs.h +++ b/HP2100/hp2100_defs.h @@ -68,8 +68,8 @@ */ -#ifndef _HP2100_DEFS_H_ -#define _HP2100_DEFS_H_ 0 +#ifndef HP2100_DEFS_H_ +#define HP2100_DEFS_H_ 0 #include "sim_defs.h" /* simulator defns */ diff --git a/HP2100/hp2100_fp.h b/HP2100/hp2100_fp.h index 4809da49..ad99ddae 100644 --- a/HP2100/hp2100_fp.h +++ b/HP2100/hp2100_fp.h @@ -27,8 +27,8 @@ 26-Sep-06 JDB Moved from hp2100_fp.c to simplify extensions */ -#ifndef _HP2100_FP_H_ -#define _HP2100_FP_H_ +#ifndef HP2100_FP_H_ +#define HP2100_FP_H_ /* Firmware floating-point routines */ diff --git a/HP2100/hp2100_fp1.h b/HP2100/hp2100_fp1.h index 4649c09a..e983d536 100644 --- a/HP2100/hp2100_fp1.h +++ b/HP2100/hp2100_fp1.h @@ -27,8 +27,8 @@ 12-Oct-06 JDB Altered x_trun for F-Series FFP compatibility */ -#ifndef _HP2100_FP1_H_ -#define _HP2100_FP1_H_ 0 +#ifndef HP2100_FP1_H_ +#define HP2100_FP1_H_ 0 /* Special operands. */ diff --git a/I1401/i1401_defs.h b/I1401/i1401_defs.h index 65affa25..680e9823 100644 --- a/I1401/i1401_defs.h +++ b/I1401/i1401_defs.h @@ -39,8 +39,8 @@ in answering questions, gathering source material, and debugging. */ -#ifndef _I1401_DEFS_H_ -#define _I1401_DEFS_H_ 0 +#ifndef I1401_DEFS_H_ +#define I1401_DEFS_H_ 0 #include "sim_defs.h" diff --git a/I1620/i1620_defs.h b/I1620/i1620_defs.h index d4183c78..5faa1043 100644 --- a/I1620/i1620_defs.h +++ b/I1620/i1620_defs.h @@ -31,8 +31,8 @@ 18-Oct-02 RMS Fixed bug in ADDR_S macro (found by Hans Pufal) */ -#ifndef _I1620_DEFS_H_ -#define _I1620_DEFS_H_ 0 +#ifndef I1620_DEFS_H_ +#define I1620_DEFS_H_ 0 #include "sim_defs.h" /* simulator defns */ diff --git a/I7094/i7094_defs.h b/I7094/i7094_defs.h index b100989e..2590b0d3 100644 --- a/I7094/i7094_defs.h +++ b/I7094/i7094_defs.h @@ -33,8 +33,8 @@ */ -#ifndef _I7094_DEFS_H_ -#define _I7094_DEFS_H_ 0 +#ifndef I7094_DEFS_H_ +#define I7094_DEFS_H_ 0 #include "sim_defs.h" /* simulator defns */ diff --git a/Interdata/id_defs.h b/Interdata/id_defs.h index 2afd3446..d2e82866 100644 --- a/Interdata/id_defs.h +++ b/Interdata/id_defs.h @@ -36,8 +36,8 @@ 28-Feb-03 RMS Changed magtape device default to 0x85 */ -#ifndef _ID_DEFS_H_ -#define _ID_DEFS_H_ 0 +#ifndef ID_DEFS_H_ +#define ID_DEFS_H_ 0 #include "sim_defs.h" /* simulator defns */ diff --git a/LGP/lgp_defs.h b/LGP/lgp_defs.h index ebe442ed..fdff4d02 100644 --- a/LGP/lgp_defs.h +++ b/LGP/lgp_defs.h @@ -26,8 +26,8 @@ 22-May-10 RMS Added check for 64b definitions */ -#ifndef _LGP_DEFS_H_ -#define _LGP_DEFS_H_ 0 +#ifndef LGP_DEFS_H_ +#define LGP_DEFS_H_ 0 #include "sim_defs.h" /* simulator defns */ diff --git a/NOVA/nova_defs.h b/NOVA/nova_defs.h index 5f5f6ffa..c534439e 100644 --- a/NOVA/nova_defs.h +++ b/NOVA/nova_defs.h @@ -46,8 +46,8 @@ the NOVA. */ -#ifndef _NOVA_DEFS_H_ -#define _NOVA_DEFS_H_ 0 +#ifndef NOVA_DEFS_H_ +#define NOVA_DEFS_H_ 0 #include "sim_defs.h" /* simulator defns */ diff --git a/PDP1/pdp1_defs.h b/PDP1/pdp1_defs.h index ed051342..5313bcee 100644 --- a/PDP1/pdp1_defs.h +++ b/PDP1/pdp1_defs.h @@ -49,8 +49,8 @@ Microtape (DECtape) control Type 550 */ -#ifndef _PDP1_DEFS_H_ -#define _PDP1_DEFS_H_ 0 +#ifndef PDP1_DEFS_H_ +#define PDP1_DEFS_H_ 0 #include "sim_defs.h" diff --git a/PDP10/pdp10_defs.h b/PDP10/pdp10_defs.h index 03834b2c..1935f4db 100644 --- a/PDP10/pdp10_defs.h +++ b/PDP10/pdp10_defs.h @@ -41,8 +41,8 @@ 19-May-01 RMS Added workaround for TOPS-20 V4.1 boot bug */ -#ifndef _PDP10_DEFS_H_ -#define _PDP10_DEFS_H_ 0 +#ifndef PDP10_DEFS_H_ +#define PDP10_DEFS_H_ 0 #ifndef VM_PDP10 #define VM_PDP10 0 diff --git a/PDP11/pdp11_cpumod.h b/PDP11/pdp11_cpumod.h index b1851313..ba8fb178 100644 --- a/PDP11/pdp11_cpumod.h +++ b/PDP11/pdp11_cpumod.h @@ -27,8 +27,8 @@ 30-Aug-05 RMS Added additional 11/60 registers */ -#ifndef _PDP11_CPUMOD_H_ -#define _PDP11_CPUMOD_H_ 0 +#ifndef PDP11_CPUMOD_H_ +#define PDP11_CPUMOD_H_ 0 #define SOP_1103 (BUS_Q) #define OPT_1103 (OPT_EIS|OPT_FIS) diff --git a/PDP11/pdp11_defs.h b/PDP11/pdp11_defs.h index 364b055b..75b77bb5 100644 --- a/PDP11/pdp11_defs.h +++ b/PDP11/pdp11_defs.h @@ -72,8 +72,8 @@ 10-Feb-01 RMS Added DECtape support */ -#ifndef _PDP11_DEFS_H -#define _PDP11_DEFS_H 0 +#ifndef PDP11_DEFS_H +#define PDP11_DEFS_H 0 #ifndef VM_PDP11 #define VM_PDP11 0 diff --git a/PDP11/pdp11_dmc.h b/PDP11/pdp11_dmc.h index e94412fe..49659053 100644 --- a/PDP11/pdp11_dmc.h +++ b/PDP11/pdp11_dmc.h @@ -40,8 +40,8 @@ // addresses of the DZ and DMC. -#ifndef _PDP11_DMC_H -#define _PDP11_DMC_H +#ifndef PDP11_DMC_H +#define PDP11_DMC_H #if defined (VM_VAX) /* VAX version */ #include "vax_defs.h" diff --git a/PDP11/pdp11_io_lib.h b/PDP11/pdp11_io_lib.h index f12bbda0..80533ea2 100644 --- a/PDP11/pdp11_io_lib.h +++ b/PDP11/pdp11_io_lib.h @@ -24,8 +24,8 @@ in this Software without prior written authorization from Robert M Supnik. */ -#ifndef _PDP11_IO_LIB_H_ -#define _PDP11_IO_LIB_H_ 0 +#ifndef PDP11_IO_LIB_H_ +#define PDP11_IO_LIB_H_ 0 t_stat set_autocon (UNIT *uptr, int32 val, char *cptr, void *desc); t_stat show_autocon (FILE *st, UNIT *uptr, int32 val, void *desc); diff --git a/PDP11/pdp11_mscp.h b/PDP11/pdp11_mscp.h index f655474a..224fdce0 100644 --- a/PDP11/pdp11_mscp.h +++ b/PDP11/pdp11_mscp.h @@ -29,8 +29,8 @@ 20-Sep-02 RMS Merged TMSCP definitions */ -#ifndef _PDP11_MSCP_H_ -#define _PDP11_MSCP_H_ 0 +#ifndef PDP11_MSCP_H_ +#define PDP11_MSCP_H_ 0 /* Misc constants */ diff --git a/PDP11/pdp11_uqssp.h b/PDP11/pdp11_uqssp.h index b995949a..a5848c25 100644 --- a/PDP11/pdp11_uqssp.h +++ b/PDP11/pdp11_uqssp.h @@ -27,8 +27,8 @@ 30-Aug-02 RMS Added TMSCP support */ -#ifndef _PDP11_UQSSP_H_ -#define _PDP11_UQSSP_H_ 0 +#ifndef PDP11_UQSSP_H_ +#define PDP11_UQSSP_H_ 0 /* IP register - initialization and polling diff --git a/PDP11/pdp11_xq.h b/PDP11/pdp11_xq.h index 4f76ee75..64d96ab0 100644 --- a/PDP11/pdp11_xq.h +++ b/PDP11/pdp11_xq.h @@ -62,8 +62,8 @@ ------------------------------------------------------------------------------ */ -#ifndef _PDP11_XQ_H -#define _PDP11_XQ_H +#ifndef PDP11_XQ_H +#define PDP11_XQ_H #if defined (VM_PDP10) /* PDP10 version */ #error "DEQNA/DELQA not supported on PDP10!" diff --git a/PDP11/pdp11_xq_bootrom.h b/PDP11/pdp11_xq_bootrom.h index 125b6c32..2295e6bc 100644 --- a/PDP11/pdp11_xq_bootrom.h +++ b/PDP11/pdp11_xq_bootrom.h @@ -34,8 +34,8 @@ ------------------------------------------------------------------------------ */ -#ifndef _PDP11_XQ_BOOTROM_H -#define _PDP11_XQ_BOOTROM_H +#ifndef PDP11_XQ_BOOTROM_H +#define PDP11_XQ_BOOTROM_H #ifdef VM_PDP11 /* diff --git a/PDP11/pdp11_xu.h b/PDP11/pdp11_xu.h index b1a1ebc5..33c1d99e 100644 --- a/PDP11/pdp11_xu.h +++ b/PDP11/pdp11_xu.h @@ -42,8 +42,8 @@ ------------------------------------------------------------------------------ */ -#ifndef _PDP11_XU_H -#define _PDP11_XU_H +#ifndef PDP11_XU_H +#define PDP11_XU_H #if defined (VM_PDP10) /* PDP10 version */ diff --git a/PDP18B/pdp18b_defs.h b/PDP18B/pdp18b_defs.h index 16388e1b..74e1d480 100644 --- a/PDP18B/pdp18b_defs.h +++ b/PDP18B/pdp18b_defs.h @@ -50,8 +50,8 @@ Al Kossow and Max Burnet in making documentation and software available. */ -#ifndef _PDP18B_DEFS_H_ -#define _PDP18B_DEFS_H_ 0 +#ifndef PDP18B_DEFS_H_ +#define PDP18B_DEFS_H_ 0 #include "sim_defs.h" /* simulator defns */ diff --git a/PDP8/pdp8_defs.h b/PDP8/pdp8_defs.h index 73bbf844..77394095 100644 --- a/PDP8/pdp8_defs.h +++ b/PDP8/pdp8_defs.h @@ -44,8 +44,8 @@ and Bill Haygood in resolving questions about the PDP-8 */ -#ifndef _PDP8_DEFS_H_ -#define _PDP8_DEFS_H_ 0 +#ifndef PDP8_DEFS_H_ +#define PDP8_DEFS_H_ 0 #include "sim_defs.h" /* simulator defns */ diff --git a/SDS/sds_defs.h b/SDS/sds_defs.h index a74ec36f..8277a144 100644 --- a/SDS/sds_defs.h +++ b/SDS/sds_defs.h @@ -27,8 +27,8 @@ 25-Apr-03 RMS Revised for extended file support */ -#ifndef _SDS_DEFS_H_ -#define _SDS_DEFS_H_ 0 +#ifndef SDS_DEFS_H_ +#define SDS_DEFS_H_ 0 #include "sim_defs.h" /* simulator defns */ diff --git a/TX-0/tx0_defs.h b/TX-0/tx0_defs.h index 58073561..e292fd91 100644 --- a/TX-0/tx0_defs.h +++ b/TX-0/tx0_defs.h @@ -37,8 +37,8 @@ * * *************************************************************************/ -#ifndef _PDP1_DEFS_H_ -#define _PDP1_DEFS_H_ 0 +#ifndef PDP1_DEFS_H_ +#define PDP1_DEFS_H_ 0 #include "sim_defs.h" diff --git a/VAX/vax610_defs.h b/VAX/vax610_defs.h index f1c33041..a3a6a42c 100644 --- a/VAX/vax610_defs.h +++ b/VAX/vax610_defs.h @@ -40,8 +40,8 @@ #undef FULL_VAX #endif -#ifndef _VAX_610_DEFS_H_ -#define _VAX_610_DEFS_H_ 1 +#ifndef VAX_610_DEFS_H_ +#define VAX_610_DEFS_H_ 1 /* Microcode constructs */ diff --git a/VAX/vax630_defs.h b/VAX/vax630_defs.h index 608f6346..e54f077e 100644 --- a/VAX/vax630_defs.h +++ b/VAX/vax630_defs.h @@ -47,8 +47,8 @@ #undef FULL_VAX #endif -#ifndef _VAX_630_DEFS_H_ -#define _VAX_630_DEFS_H_ 1 +#ifndef VAX_630_DEFS_H_ +#define VAX_630_DEFS_H_ 1 /* Microcode constructs */ diff --git a/VAX/vax730_defs.h b/VAX/vax730_defs.h index 0559fa57..1a27fb02 100644 --- a/VAX/vax730_defs.h +++ b/VAX/vax730_defs.h @@ -41,8 +41,8 @@ #define FULL_VAX 1 #endif -#ifndef _VAX_730_DEFS_H_ -#define _VAX_730_DEFS_H_ 1 +#ifndef VAX_730_DEFS_H_ +#define VAX_730_DEFS_H_ 1 /* Microcode constructs */ diff --git a/VAX/vax750_defs.h b/VAX/vax750_defs.h index de013454..36e1011b 100644 --- a/VAX/vax750_defs.h +++ b/VAX/vax750_defs.h @@ -47,8 +47,8 @@ #define FULL_VAX 1 #endif -#ifndef _VAX_750_DEFS_H_ -#define _VAX_750_DEFS_H_ 1 +#ifndef VAX_750_DEFS_H_ +#define VAX_750_DEFS_H_ 1 /* Microcode constructs */ diff --git a/VAX/vax780_defs.h b/VAX/vax780_defs.h index b043de4c..9ab0bbb3 100644 --- a/VAX/vax780_defs.h +++ b/VAX/vax780_defs.h @@ -50,8 +50,8 @@ #define FULL_VAX 1 #endif -#ifndef _VAX_780_DEFS_H_ -#define _VAX_780_DEFS_H_ 1 +#ifndef VAX_780_DEFS_H_ +#define VAX_780_DEFS_H_ 1 /* Microcode constructs */ diff --git a/VAX/vax860_defs.h b/VAX/vax860_defs.h index 4f0096ca..41892016 100644 --- a/VAX/vax860_defs.h +++ b/VAX/vax860_defs.h @@ -77,8 +77,8 @@ #define FULL_VAX 1 #endif -#ifndef _VAX_860_DEFS_H_ -#define _VAX_860_DEFS_H_ 1 +#ifndef VAX_860_DEFS_H_ +#define VAX_860_DEFS_H_ 1 /* Microcode constructs */ diff --git a/VAX/vax_defs.h b/VAX/vax_defs.h index 803d847c..893a91c7 100644 --- a/VAX/vax_defs.h +++ b/VAX/vax_defs.h @@ -40,8 +40,8 @@ 30-Apr-02 RMS Added CLR_TRAPS macro */ -#ifndef _VAX_DEFS_H -#define _VAX_DEFS_H 0 +#ifndef VAX_DEFS_H +#define VAX_DEFS_H 0 #ifndef VM_VAX #define VM_VAX 0 diff --git a/VAX/vaxmod_defs.h b/VAX/vaxmod_defs.h index abe62c1b..f3997fdf 100644 --- a/VAX/vaxmod_defs.h +++ b/VAX/vaxmod_defs.h @@ -69,8 +69,8 @@ #undef FULL_VAX #endif -#ifndef _VAXMOD_DEFS_H_ -#define _VAXMOD_DEFS_H_ 1 +#ifndef VAXMOD_DEFS_H_ +#define VAXMOD_DEFS_H_ 1 /* Microcode constructs */ diff --git a/alpha/alpha_defs.h b/alpha/alpha_defs.h index 6f1ee907..ef21f152 100644 --- a/alpha/alpha_defs.h +++ b/alpha/alpha_defs.h @@ -28,8 +28,8 @@ Alpha Program Office. */ -#ifndef _ALPHA_DEFS_H_ -#define _ALPHA_DEFS_H_ 0 +#ifndef ALPHA_DEFS_H_ +#define ALPHA_DEFS_H_ 0 #include "sim_defs.h" #include diff --git a/alpha/alpha_ev5_defs.h b/alpha/alpha_ev5_defs.h index cba29614..cfeeb65d 100644 --- a/alpha/alpha_ev5_defs.h +++ b/alpha/alpha_ev5_defs.h @@ -28,8 +28,8 @@ Alpha Program Office. */ -#ifndef _ALPHA_EV5_DEFS_H_ -#define _ALPHA_EV5_DEFS_H_ 0 +#ifndef ALPHA_EV5_DEFS_H_ +#define ALPHA_EV5_DEFS_H_ 0 /* Address limits */ diff --git a/alpha/alpha_sys_defs.h b/alpha/alpha_sys_defs.h index 7af5a908..6cecd936 100644 --- a/alpha/alpha_sys_defs.h +++ b/alpha/alpha_sys_defs.h @@ -30,8 +30,8 @@ This is a STUB! */ -#ifndef _ALPHA_SYS_DEFS_H_ -#define _ALPHA_SYS_DEFS_H_ 0 +#ifndef ALPHA_SYS_DEFS_H_ +#define ALPHA_SYS_DEFS_H_ 0 #define PA_SIZE 36 /* PA size */ #define PA_MASK 0x0000000FFFFFFFFF diff --git a/alpha/old_pal/alpha_pal_defs.h b/alpha/old_pal/alpha_pal_defs.h index 6471e36b..96a2c605 100644 --- a/alpha/old_pal/alpha_pal_defs.h +++ b/alpha/old_pal/alpha_pal_defs.h @@ -28,8 +28,8 @@ Alpha Program Office. */ -#ifndef _ALPHA_PAL_DEFS_H_ -#define _ALPHA_PAL_DEFS_H_ 0 +#ifndef ALPHA_PAL_DEFS_H_ +#define ALPHA_PAL_DEFS_H_ 0 /* VA - NT software format */ diff --git a/display/vt11.h b/display/vt11.h index 07450ee5..c647b121 100644 --- a/display/vt11.h +++ b/display/vt11.h @@ -34,11 +34,11 @@ * from the authors. */ -#ifndef _SIM_DEFS_H_ +#ifndef SIM_DEFS_H_ typedef unsigned short uint16; typedef long int32; typedef unsigned long uint32; -#endif /* _SIM_DEFS_H_ */ +#endif /* SIM_DEFS_H_ */ /* * VT11 jumpers control character spacing; VS60 always uses VT11 normal. diff --git a/scp.c b/scp.c index c5db797d..4d45c467 100644 --- a/scp.c +++ b/scp.c @@ -2777,9 +2777,9 @@ if (flag) { #endif } #if defined(SIM_GIT_COMMIT_ID) -#define _xstr(a) _str(a) -#define _str(a) #a -fprintf (st, "%sgit commit id: %8.8s", flag ? "\n " : " ", _xstr(SIM_GIT_COMMIT_ID)); +#define S_xstr(a) S_str(a) +#define S_str(a) #a +fprintf (st, "%sgit commit id: %8.8s", flag ? "\n " : " ", S_xstr(SIM_GIT_COMMIT_ID)); #endif fprintf (st, "\n"); return SCPE_OK; @@ -4963,15 +4963,15 @@ if (!initialized) { initialized = 1; void *handle; -#define __STR_QUOTE(tok) #tok -#define __STR(tok) __STR_QUOTE(tok) - handle = dlopen("libncurses." __STR(HAVE_DLOPEN), RTLD_NOW|RTLD_GLOBAL); - handle = dlopen("libcurses." __STR(HAVE_DLOPEN), RTLD_NOW|RTLD_GLOBAL); - handle = dlopen("libreadline." __STR(HAVE_DLOPEN), RTLD_NOW|RTLD_GLOBAL); +#define S__STR_QUOTE(tok) #tok +#define S__STR(tok) S__STR_QUOTE(tok) + handle = dlopen("libncurses." S__STR(HAVE_DLOPEN), RTLD_NOW|RTLD_GLOBAL); + handle = dlopen("libcurses." S__STR(HAVE_DLOPEN), RTLD_NOW|RTLD_GLOBAL); + handle = dlopen("libreadline." S__STR(HAVE_DLOPEN), RTLD_NOW|RTLD_GLOBAL); if (!handle) - handle = dlopen("libreadline." __STR(HAVE_DLOPEN) ".6", RTLD_NOW|RTLD_GLOBAL); + handle = dlopen("libreadline." S__STR(HAVE_DLOPEN) ".6", RTLD_NOW|RTLD_GLOBAL); if (!handle) - handle = dlopen("libreadline." __STR(HAVE_DLOPEN) ".5", RTLD_NOW|RTLD_GLOBAL); + handle = dlopen("libreadline." S__STR(HAVE_DLOPEN) ".5", RTLD_NOW|RTLD_GLOBAL); if (handle) { p_readline = (readline_func)((size_t)dlsym(handle, "readline")); p_add_history = (add_history_func)((size_t)dlsym(handle, "add_history")); diff --git a/scp.h b/scp.h index 61dfe956..8bf399b4 100644 --- a/scp.h +++ b/scp.h @@ -34,8 +34,8 @@ 02-Jan-04 RMS Split out from SCP */ -#ifndef _SIM_SCP_H_ -#define _SIM_SCP_H_ 0 +#ifndef SIM_SCP_H_ +#define SIM_SCP_H_ 0 /* run_cmd parameters */ diff --git a/sigma/sigma_defs.h b/sigma/sigma_defs.h index 5c6951ee..a2033d0a 100644 --- a/sigma/sigma_defs.h +++ b/sigma/sigma_defs.h @@ -29,8 +29,8 @@ 22-May-10 RMS Added check for 64b definitions */ -#ifndef _SIGMA_DEFS_H_ -#define _SIGMA_DEFS_H_ 0 +#ifndef SIGMA_DEFS_H_ +#define SIGMA_DEFS_H_ 0 #include "sim_defs.h" /* simulator defns */ diff --git a/sigma/sigma_io_defs.h b/sigma/sigma_io_defs.h index a44c4f91..0a24b810 100644 --- a/sigma/sigma_io_defs.h +++ b/sigma/sigma_io_defs.h @@ -24,8 +24,8 @@ in this Software without prior written authorization from Robert M Supnik. */ -#ifndef _SIGMA_IO_DEFS_H_ -#define _SIGMA_IO_DEFS_H_ 0 +#ifndef SIGMA_IO_DEFS_H_ +#define SIGMA_IO_DEFS_H_ 0 #include "sim_defs.h" /* simulator defns */ #include "sigma_defs.h" diff --git a/sim_console.h b/sim_console.h index 6782ef0d..c3cb332c 100644 --- a/sim_console.h +++ b/sim_console.h @@ -31,8 +31,8 @@ 02-Jan-04 RMS Removed timer routines, added Telnet console routines */ -#ifndef _SIM_CONSOLE_H_ -#define _SIM_CONSOLE_H_ 0 +#ifndef SIM_CONSOLE_H_ +#define SIM_CONSOLE_H_ 0 #define TTUF_V_MODE (UNIT_V_UF + 0) #define TTUF_W_MODE 2 diff --git a/sim_defs.h b/sim_defs.h index 21d2c9dd..6bdc4501 100644 --- a/sim_defs.h +++ b/sim_defs.h @@ -102,8 +102,8 @@ parse_sym parse symbolic input */ -#ifndef _SIM_DEFS_H_ -#define _SIM_DEFS_H_ 0 +#ifndef SIM_DEFS_H_ +#define SIM_DEFS_H_ 0 #include #include diff --git a/sim_disk.c b/sim_disk.c index bab624f3..eb62b612 100644 --- a/sim_disk.c +++ b/sim_disk.c @@ -3039,9 +3039,9 @@ uuid_gen (void *uuidaddr) void (*uuid_generate_c) (void *) = NULL; void *handle; -#define __STR_QUOTE(tok) #tok -#define __STR(tok) __STR_QUOTE(tok) - handle = dlopen("libuuid." __STR(HAVE_DLOPEN), RTLD_NOW|RTLD_GLOBAL); +#define S__STR_QUOTE(tok) #tok +#define S__STR(tok) S__STR_QUOTE(tok) + handle = dlopen("libuuid." S__STR(HAVE_DLOPEN), RTLD_NOW|RTLD_GLOBAL); if (handle) uuid_generate_c = (void (*)(void *))((size_t)dlsym(handle, "uuid_generate")); if (uuid_generate_c) diff --git a/sim_disk.h b/sim_disk.h index 8701404e..1af4dd30 100644 --- a/sim_disk.h +++ b/sim_disk.h @@ -27,8 +27,8 @@ 25-Jan-11 MP Initial Implemementation */ -#ifndef _SIM_DISK_H_ -#define _SIM_DISK_H_ 0 +#ifndef SIM_DISK_H_ +#define SIM_DISK_H_ 0 /* SIMH/Disk format */ diff --git a/sim_ether.h b/sim_ether.h index c11db144..82268108 100644 --- a/sim_ether.h +++ b/sim_ether.h @@ -63,8 +63,8 @@ ------------------------------------------------------------------------------ */ -#ifndef _SIM_ETHER_H -#define _SIM_ETHER_H +#ifndef SIM_ETHER_H +#define SIM_ETHER_H #include "sim_defs.h" diff --git a/sim_fio.c b/sim_fio.c index 10803288..807100d6 100644 --- a/sim_fio.c +++ b/sim_fio.c @@ -233,7 +233,7 @@ return fopen (file, mode); /* 64b VMS */ #if (defined (__ALPHA) || defined (__ia64)) && defined (VMS) && (__DECC_VER >= 60590001) -#define _SIM_IO_FSEEK_EXT_ 1 +#define S_SIM_IO_FSEEK_EXT_ 1 int sim_fseek (FILE *st, t_addr offset, int whence) { @@ -250,7 +250,7 @@ return (t_addr)(ftello (st)); /* Alpha UNIX - natively 64b */ #if defined (__ALPHA) && defined (__unix__) /* Alpha UNIX */ -#define _SIM_IO_FSEEK_EXT_ 1 +#define S_SIM_IO_FSEEK_EXT_ 1 int sim_fseek (FILE *st, t_addr offset, int whence) { @@ -267,7 +267,7 @@ return (t_addr)(ftell (st)); /* Windows */ #if defined (_WIN32) -#define _SIM_IO_FSEEK_EXT_ 1 +#define S_SIM_IO_FSEEK_EXT_ 1 #include int sim_fseek (FILE *st, t_addr offset, int whence) @@ -313,7 +313,7 @@ return (t_addr)fileaddr; /* Linux */ #if defined (__linux) || defined (__linux__) || defined (__hpux) -#define _SIM_IO_FSEEK_EXT_ 1 +#define S_SIM_IO_FSEEK_EXT_ 1 int sim_fseek (FILE *st, t_addr xpos, int origin) { @@ -330,7 +330,7 @@ return (t_addr)(ftello64 (st)); /* Apple OS/X */ #if defined (__APPLE__) || defined (__FreeBSD__) -#define _SIM_IO_FSEEK_EXT_ 1 +#define S_SIM_IO_FSEEK_EXT_ 1 int sim_fseek (FILE *st, t_addr xpos, int origin) { @@ -348,8 +348,8 @@ return (t_addr)(ftello (st)); /* Default: no OS-specific routine has been defined */ -#if !defined (_SIM_IO_FSEEK_EXT_) -#define _SIM_IO_FSEEK_EXT_ 0 +#if !defined (S_SIM_IO_FSEEK_EXT_) +#define S_SIM_IO_FSEEK_EXT_ 0 int sim_fseek (FILE *st, t_addr xpos, int origin) { @@ -363,5 +363,5 @@ return (t_addr)(ftell (st)); #endif -uint32 sim_taddr_64 = _SIM_IO_FSEEK_EXT_; +uint32 sim_taddr_64 = S_SIM_IO_FSEEK_EXT_; diff --git a/sim_fio.h b/sim_fio.h index b0440426..170f2739 100644 --- a/sim_fio.h +++ b/sim_fio.h @@ -30,8 +30,8 @@ 02-Jan-04 RMS Split out from SCP */ -#ifndef _SIM_FIO_H_ -#define _SIM_FIO_H_ 0 +#ifndef SIM_FIO_H_ +#define SIM_FIO_H_ 0 #define FLIP_SIZE (1 << 16) /* flip buf size */ #define fxread(a,b,c,d) sim_fread (a, b, c, d) diff --git a/sim_rev.h b/sim_rev.h index 09290e73..d0f3f87b 100644 --- a/sim_rev.h +++ b/sim_rev.h @@ -24,8 +24,8 @@ in this Software without prior written authorization from Robert M Supnik. */ -#ifndef _SIM_REV_H_ -#define _SIM_REV_H_ 0 +#ifndef SIM_REV_H_ +#define SIM_REV_H_ 0 #ifndef SIM_MAJOR #define SIM_MAJOR 4 diff --git a/sim_serial.h b/sim_serial.h index 91bc40b2..757c2713 100644 --- a/sim_serial.h +++ b/sim_serial.h @@ -27,8 +27,8 @@ */ -#ifndef _SIM_SERIAL_H_ -#define _SIM_SERIAL_H_ 0 +#ifndef SIM_SERIAL_H_ +#define SIM_SERIAL_H_ 0 #if defined (_WIN32) /* Windows definitions */ @@ -73,14 +73,14 @@ #endif /* OS variants */ -#ifndef _SERHANDLE_DEFINED -#define _SERHANDLE_DEFINED 0 +#ifndef SERHANDLE_DEFINED +#define SERHANDLE_DEFINED 0 #if defined (_WIN32) /* Windows definitions */ typedef void *SERHANDLE; #else /* all other platforms */ typedef int SERHANDLE; #endif -#endif /* _SERHANDLE_DEFINED */ +#endif /* SERHANDLE_DEFINED */ /* Common definitions */ diff --git a/sim_sock.h b/sim_sock.h index 36d4122c..03903b07 100644 --- a/sim_sock.h +++ b/sim_sock.h @@ -43,8 +43,8 @@ 16-Sep-01 RMS Added Macintosh support from Peter Schorn */ -#ifndef _SIM_SOCK_H_ -#define _SIM_SOCK_H_ 0 +#ifndef SIM_SOCK_H_ +#define SIM_SOCK_H_ 0 #if defined (_WIN32) /* Windows */ #include diff --git a/sim_tape.h b/sim_tape.h index 0e8bff43..ae68688f 100644 --- a/sim_tape.h +++ b/sim_tape.h @@ -31,8 +31,8 @@ 02-May-05 RMS Added support for Paul Pierce 7b format */ -#ifndef _SIM_TAPE_H_ -#define _SIM_TAPE_H_ 0 +#ifndef SIM_TAPE_H_ +#define SIM_TAPE_H_ 0 /* SIMH/E11 tape format */ diff --git a/sim_timer.h b/sim_timer.h index 9912325e..f12c935f 100644 --- a/sim_timer.h +++ b/sim_timer.h @@ -28,8 +28,8 @@ 02-Jan-04 RMS Split out from SCP */ -#ifndef _SIM_TIMER_H_ -#define _SIM_TIMER_H_ 0 +#ifndef SIM_TIMER_H_ +#define SIM_TIMER_H_ 0 /* Pick up a struct timespec definition if it is available */ #include diff --git a/sim_tmxr.h b/sim_tmxr.h index f904efca..ea63bf15 100644 --- a/sim_tmxr.h +++ b/sim_tmxr.h @@ -44,11 +44,11 @@ added tmxr_rqln, tmxr_tqln */ -#ifndef _SIM_TMXR_H_ -#define _SIM_TMXR_H_ 0 +#ifndef SIM_TMXR_H_ +#define SIM_TMXR_H_ 0 -#ifndef _SERHANDLE_DEFINED -#define _SERHANDLE_DEFINED 0 +#ifndef SIMH_SERHANDLE_DEFINED +#define SIMH_SERHANDLE_DEFINED 0 #if defined (_WIN32) /* Windows definitions */ typedef void *SERHANDLE; #else /* all other platforms */