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

This commit is contained in:
Mark Pizzolato 2013-03-12 11:07:58 -07:00
parent fb105a922f
commit d5ca542102
58 changed files with 136 additions and 136 deletions

View file

@ -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 */

View file

@ -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 */

View file

@ -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 <setjmp.h>

View file

@ -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 */

View file

@ -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 */

View file

@ -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 */

View file

@ -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. */

View file

@ -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"

View file

@ -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 */

View file

@ -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 */

View file

@ -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 */

View file

@ -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 */

View file

@ -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 */

View file

@ -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"

View file

@ -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

View file

@ -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)

View file

@ -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

View file

@ -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"

View file

@ -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);

View file

@ -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 */

View file

@ -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

View file

@ -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!"

View file

@ -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
/*

View file

@ -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 */

View file

@ -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 */

View file

@ -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 */

View file

@ -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 */

View file

@ -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"

View file

@ -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 */

View file

@ -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 */

View file

@ -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 */

View file

@ -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 */

View file

@ -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 */

View file

@ -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 */

View file

@ -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

View file

@ -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 */

View file

@ -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 <setjmp.h>

View file

@ -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 */

View file

@ -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

View file

@ -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 */

View file

@ -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.

20
scp.c
View file

@ -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"));

4
scp.h
View file

@ -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 */

View file

@ -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 */

View file

@ -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"

View file

@ -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

View file

@ -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 <stddef.h>
#include <stdlib.h>

View file

@ -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)

View file

@ -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 */

View file

@ -63,8 +63,8 @@
------------------------------------------------------------------------------
*/
#ifndef _SIM_ETHER_H
#define _SIM_ETHER_H
#ifndef SIM_ETHER_H
#define SIM_ETHER_H
#include "sim_defs.h"

View file

@ -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 <sys/stat.h>
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_;

View file

@ -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)

View file

@ -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

View file

@ -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 */

View file

@ -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 <winsock2.h>

View file

@ -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 */

View file

@ -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 <time.h>

View file

@ -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 */