Skip to content

Commit 559b2cc

Browse files
Fish-GitFish-Git
committedApr 23, 2016
(Purely cosmetic. Actual functionality was not changed.)
·
FixIgnore4.0.0-rc0
1 parent 52ef9a7 commit 559b2cc

8 files changed

+59
-45
lines changed
 

‎Hercules.vcproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
ReBuildCommandLine="makefile.bat DEBUG makefile.msvc 32 -a"
3333
CleanCommandLine="makefile.bat DEBUG makefile.msvc 32 clean"
3434
Output="$(OutDir)"
35-
PreprocessorDefinitions="FEATURE_SERVICE_PROCESSOR;FEATURE_EXTENDED_STORAGE_KEYS;OPTION_HTTP_SERVER;_DAT_C;FEATURE_PROGRAM_DIRECTED_REIPL;FEATURE_EMULATE_VM;ENABLE_IPV6;OPTION_CMPSC_2012;FEATURE_BINARY_FLOATING_POINT;WIN32;_DEBUG;DEBUG;_MSVC_;CPU=i386;HOST_ARCH=i386;OPTION_DYNAMIC_LOAD;HDL_BUILD_SHARED;OPTION_FTHREADS;EXTERNALGUI;FEATURE_CHANNEL_SUBSYSTEM;FEATURE_CANCEL_IO_FACILITY;FEATURE_ESAME;FEATURE_CONFIGURATION_TOPOLOGY_FACILITY;OPTION_HAO;HAVE_REGINA_REXXSAA_H;OPTION_CMDTGT;_FEATURE_SYSTEM_CONSOLE;FEATURE_CHSC;OPTION_PTTRACE;FEATURE_COMPRESSION;ENABLE_REGINA_REXX;ENABLE_OBJECT_REXX;FEATURE_QUEUED_DIRECT_IO;_FEATURE_SIE;FEATURE_S370_CHANNEL"
35+
PreprocessorDefinitions="_FEATURE_INTEGRATED_3270_CONSOLE;FEATURE_SERVICE_PROCESSOR;FEATURE_EXTENDED_STORAGE_KEYS;OPTION_HTTP_SERVER;_DAT_C;FEATURE_PROGRAM_DIRECTED_REIPL;FEATURE_EMULATE_VM;ENABLE_IPV6;OPTION_CMPSC_2012;FEATURE_BINARY_FLOATING_POINT;WIN32;_DEBUG;DEBUG;_MSVC_;CPU=i386;HOST_ARCH=i386;OPTION_DYNAMIC_LOAD;HDL_BUILD_SHARED;OPTION_FTHREADS;EXTERNALGUI;FEATURE_CHANNEL_SUBSYSTEM;FEATURE_CANCEL_IO_FACILITY;FEATURE_ESAME;FEATURE_CONFIGURATION_TOPOLOGY_FACILITY;OPTION_HAO;HAVE_REGINA_REXXSAA_H;OPTION_CMDTGT;_FEATURE_SYSTEM_CONSOLE;FEATURE_CHSC;OPTION_PTTRACE;FEATURE_COMPRESSION;ENABLE_REGINA_REXX;ENABLE_OBJECT_REXX;FEATURE_QUEUED_DIRECT_IO;_FEATURE_SIE;FEATURE_S370_CHANNEL"
3636
IncludeSearchPath="crypto;decNumber;$(ProjectDir)"
3737
ForcedIncludes=""
3838
AssemblySearchPath=""
@@ -53,7 +53,7 @@
5353
ReBuildCommandLine="makefile.bat DEBUG-X64 makefile.msvc 32 -a"
5454
CleanCommandLine="makefile.bat DEBUG-X64 makefile.msvc 32 clean"
5555
Output="$(OutDir)"
56-
PreprocessorDefinitions="FEATURE_SERVICE_PROCESSOR;FEATURE_EXTENDED_STORAGE_KEYS;OPTION_HTTP_SERVER;_DAT_C;FEATURE_PROGRAM_DIRECTED_REIPL;FEATURE_EMULATE_VM;ENABLE_IPV6;OPTION_CMPSC_2012;FEATURE_BINARY_FLOATING_POINT;WIN32;_WIN64;_DEBUG;DEBUG;_MSVC_;CPU=AMD64;HOST_ARCH=AMD64;OPTION_DYNAMIC_LOAD;HDL_BUILD_SHARED;OPTION_FTHREADS;EXTERNALGUI;FEATURE_CHANNEL_SUBSYSTEM;FEATURE_CANCEL_IO_FACILITY;FEATURE_ESAME;FEATURE_CONFIGURATION_TOPOLOGY_FACILITY;OPTION_HAO;HAVE_REGINA_REXXSAA_H;OPTION_CMDTGT;_FEATURE_SYSTEM_CONSOLE;FEATURE_CHSC;OPTION_PTTRACE;FEATURE_COMPRESSION;ENABLE_REGINA_REXX;ENABLE_OBJECT_REXX;FEATURE_QUEUED_DIRECT_IO;_FEATURE_SIE;FEATURE_S370_CHANNEL"
56+
PreprocessorDefinitions="_FEATURE_INTEGRATED_3270_CONSOLE;FEATURE_SERVICE_PROCESSOR;FEATURE_EXTENDED_STORAGE_KEYS;OPTION_HTTP_SERVER;_DAT_C;FEATURE_PROGRAM_DIRECTED_REIPL;FEATURE_EMULATE_VM;ENABLE_IPV6;OPTION_CMPSC_2012;FEATURE_BINARY_FLOATING_POINT;WIN32;_WIN64;_DEBUG;DEBUG;_MSVC_;CPU=AMD64;HOST_ARCH=AMD64;OPTION_DYNAMIC_LOAD;HDL_BUILD_SHARED;OPTION_FTHREADS;EXTERNALGUI;FEATURE_CHANNEL_SUBSYSTEM;FEATURE_CANCEL_IO_FACILITY;FEATURE_ESAME;FEATURE_CONFIGURATION_TOPOLOGY_FACILITY;OPTION_HAO;HAVE_REGINA_REXXSAA_H;OPTION_CMDTGT;_FEATURE_SYSTEM_CONSOLE;FEATURE_CHSC;OPTION_PTTRACE;FEATURE_COMPRESSION;ENABLE_REGINA_REXX;ENABLE_OBJECT_REXX;FEATURE_QUEUED_DIRECT_IO;_FEATURE_SIE;FEATURE_S370_CHANNEL"
5757
IncludeSearchPath="crypto;decNumber;$(ProjectDir)"
5858
ForcedIncludes=""
5959
AssemblySearchPath=""
@@ -74,7 +74,7 @@
7474
ReBuildCommandLine="makefile.bat RETAIL makefile.msvc 32 -a"
7575
CleanCommandLine="makefile.bat RETAIL makefile.msvc 32 clean"
7676
Output="$(OutDir)"
77-
PreprocessorDefinitions="FEATURE_SERVICE_PROCESSOR;FEATURE_EXTENDED_STORAGE_KEYS;OPTION_HTTP_SERVER;_DAT_C;FEATURE_PROGRAM_DIRECTED_REIPL;FEATURE_EMULATE_VM;ENABLE_IPV6;OPTION_CMPSC_2012;FEATURE_BINARY_FLOATING_POINT;WIN32;NDEBUG;_MSVC_;CPU=i386;HOST_ARCH=i386;OPTION_DYNAMIC_LOAD;HDL_BUILD_SHARED;OPTION_FTHREADS;EXTERNALGUI;FEATURE_CHANNEL_SUBSYSTEM;FEATURE_CANCEL_IO_FACILITY;FEATURE_ESAME;FEATURE_CONFIGURATION_TOPOLOGY_FACILITY;OPTION_HAO;HAVE_REGINA_REXXSAA_H;OPTION_CMDTGT;_FEATURE_SYSTEM_CONSOLE;FEATURE_CHSC;OPTION_PTTRACE;FEATURE_COMPRESSION;ENABLE_REGINA_REXX;ENABLE_OBJECT_REXX;FEATURE_QUEUED_DIRECT_IO;_FEATURE_SIE;FEATURE_S370_CHANNEL"
77+
PreprocessorDefinitions="_FEATURE_INTEGRATED_3270_CONSOLE;FEATURE_SERVICE_PROCESSOR;FEATURE_EXTENDED_STORAGE_KEYS;OPTION_HTTP_SERVER;_DAT_C;FEATURE_PROGRAM_DIRECTED_REIPL;FEATURE_EMULATE_VM;ENABLE_IPV6;OPTION_CMPSC_2012;FEATURE_BINARY_FLOATING_POINT;WIN32;NDEBUG;_MSVC_;CPU=i386;HOST_ARCH=i386;OPTION_DYNAMIC_LOAD;HDL_BUILD_SHARED;OPTION_FTHREADS;EXTERNALGUI;FEATURE_CHANNEL_SUBSYSTEM;FEATURE_CANCEL_IO_FACILITY;FEATURE_ESAME;FEATURE_CONFIGURATION_TOPOLOGY_FACILITY;OPTION_HAO;HAVE_REGINA_REXXSAA_H;OPTION_CMDTGT;_FEATURE_SYSTEM_CONSOLE;FEATURE_CHSC;OPTION_PTTRACE;FEATURE_COMPRESSION;ENABLE_REGINA_REXX;ENABLE_OBJECT_REXX;FEATURE_QUEUED_DIRECT_IO;_FEATURE_SIE;FEATURE_S370_CHANNEL"
7878
IncludeSearchPath="crypto;decNumber;$(ProjectDir)"
7979
ForcedIncludes=""
8080
AssemblySearchPath=""
@@ -95,7 +95,7 @@
9595
ReBuildCommandLine="makefile.bat RETAIL-X64 makefile.msvc 32 -a"
9696
CleanCommandLine="makefile.bat RETAIL-X64 makefile.msvc 32 clean"
9797
Output="$(OutDir)"
98-
PreprocessorDefinitions="FEATURE_SERVICE_PROCESSOR;FEATURE_EXTENDED_STORAGE_KEYS;OPTION_HTTP_SERVER;_DAT_C;FEATURE_PROGRAM_DIRECTED_REIPL;FEATURE_EMULATE_VM;ENABLE_IPV6;OPTION_CMPSC_2012;FEATURE_BINARY_FLOATING_POINT;WIN32;_WIN64;NDEBUG;_MSVC_;CPU=AMD64;HOST_ARCH=AMD64;OPTION_DYNAMIC_LOAD;HDL_BUILD_SHARED;OPTION_FTHREADS;EXTERNALGUI;FEATURE_CHANNEL_SUBSYSTEM;FEATURE_CANCEL_IO_FACILITY;FEATURE_ESAME;FEATURE_CONFIGURATION_TOPOLOGY_FACILITY;OPTION_HAO;HAVE_REGINA_REXXSAA_H;OPTION_CMDTGT;_FEATURE_SYSTEM_CONSOLE;FEATURE_CHSC;OPTION_PTTRACE;FEATURE_COMPRESSION;ENABLE_REGINA_REXX;ENABLE_OBJECT_REXX;FEATURE_QUEUED_DIRECT_IO;_FEATURE_SIE;FEATURE_S370_CHANNEL"
98+
PreprocessorDefinitions="_FEATURE_INTEGRATED_3270_CONSOLE;FEATURE_SERVICE_PROCESSOR;FEATURE_EXTENDED_STORAGE_KEYS;OPTION_HTTP_SERVER;_DAT_C;FEATURE_PROGRAM_DIRECTED_REIPL;FEATURE_EMULATE_VM;ENABLE_IPV6;OPTION_CMPSC_2012;FEATURE_BINARY_FLOATING_POINT;WIN32;_WIN64;NDEBUG;_MSVC_;CPU=AMD64;HOST_ARCH=AMD64;OPTION_DYNAMIC_LOAD;HDL_BUILD_SHARED;OPTION_FTHREADS;EXTERNALGUI;FEATURE_CHANNEL_SUBSYSTEM;FEATURE_CANCEL_IO_FACILITY;FEATURE_ESAME;FEATURE_CONFIGURATION_TOPOLOGY_FACILITY;OPTION_HAO;HAVE_REGINA_REXXSAA_H;OPTION_CMDTGT;_FEATURE_SYSTEM_CONSOLE;FEATURE_CHSC;OPTION_PTTRACE;FEATURE_COMPRESSION;ENABLE_REGINA_REXX;ENABLE_OBJECT_REXX;FEATURE_QUEUED_DIRECT_IO;_FEATURE_SIE;FEATURE_S370_CHANNEL"
9999
IncludeSearchPath="crypto;decNumber;$(ProjectDir)"
100100
ForcedIncludes=""
101101
AssemblySearchPath=""

‎ccfixme.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/*-------------------------------------------------------------------*/
88
/* This header file #defines a generic "FIXME" macro used to mark */
99
/* suspicious code needing fixed or at least further investigated. */
10+
/* Sample usage: TODO( "Figure out a better way to calculate foo" ) */
1011
/* It is designed to work identically for GCC as well as MSVC. The */
1112
/* only argument is the "fixme" message you wish to be issued. To */
1213
/* suppress a compiler warning, use the "DISABLE_xxx_WARNING" and */
@@ -53,7 +54,7 @@
5354
#if defined( _MSVC_ )
5455
#define FIXME( _str ) __pragma( message( FIXME_LINE _str ))
5556
#elif defined( __GNUC__ ) && defined( HAVE_GCC_DIAG_PRAGMA )
56-
#define FIXME( _str ) QPRAGMA( message( _str ))
57+
#define FIXME( _str ) QPRAGMA( message( FIXME_LINE _str ))
5758
#endif
5859

5960
#ifndef FIXME
@@ -67,7 +68,7 @@
6768
#if defined( _MSVC_ )
6869
#define TODO( _str ) __pragma( message( TODO_LINE _str ))
6970
#elif defined( __GNUC__ ) && defined( HAVE_GCC_DIAG_PRAGMA )
70-
#define TODO( _str ) QPRAGMA( message( _str ))
71+
#define TODO( _str ) QPRAGMA( message( TODO_LINE _str ))
7172
#endif
7273

7374
#ifndef TODO
@@ -81,7 +82,7 @@
8182
#if defined( _MSVC_ )
8283
#define WARNING( _str ) __pragma( message( WARN_LINE _str ))
8384
#elif defined( __GNUC__ ) && defined( HAVE_GCC_DIAG_PRAGMA )
84-
#define WARNING( _str ) QPRAGMA( message( _str ))
85+
#define WARNING( _str ) QPRAGMA( message( WARN_LINE _str ))
8586
#endif
8687

8788
#ifndef WARNING
@@ -95,7 +96,7 @@
9596
#if defined( _MSVC_ )
9697
#define NOTE( _str ) __pragma( message( NOTE_LINE _str ))
9798
#elif defined( __GNUC__ ) && defined( HAVE_GCC_DIAG_PRAGMA )
98-
#define NOTE( _str ) QPRAGMA( message( _str ))
99+
#define NOTE( _str ) QPRAGMA( message( NOTE_LINE _str ))
99100
#endif
100101

101102
#ifndef NOTE

‎ccnowarn.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
/*-------------------------------------------------------------------*/
88
/* The "DISABLE_xxx_WARNING" and "ENABLE_xxx_WARNING" macros allow */
99
/* you to temporarily suppress certain harmless compiler warnings. */
10+
/* Sample usage: DISABLE_GCC_WARNING( "-Wpointer-to-int-cast" ) */
11+
/* DISABLE_MSVC_WARNING( 4142 ) // "benign redefinition of type" */
1012
/* Use the "_DISABLE" macro before the source statement which is */
11-
/* causing the problem and the "_ENABLE" macro shortly afterwards. */
13+
/* causing the problem and the "ENABLE" macro shortly afterwards. */
1214
/* PLEASE DO NOT GO OVERBOARD (overdo or overuse) THE SUPPRESSION */
1315
/* OF WARNINGS! Most warnings are actually bugs waiting to happen. */
1416
/* The "DISABLE_xxx_WARNING" and "ENABLE_xxx_WARNING" macros are */

‎commadpt.c

+17-13
Original file line numberDiff line numberDiff line change
@@ -138,19 +138,23 @@
138138
#define sysblk (*psysblk)
139139
#endif
140140

141-
/*-------------------------------------------------------------------*/
142-
/* Ivan Warren 20040227 */
143-
/* This table is used by channel.c to determine if a CCW code is an */
144-
/* immediate command or not */
145-
/* The tape is addressed in the DEVHND structure as 'DEVIMM immed' */
146-
/* 0 : Command is NOT an immediate command */
147-
/* 1 : Command is an immediate command */
148-
/* Note : An immediate command is defined as a command which returns */
149-
/* CE (channel end) during initialisation (that is, no data is */
150-
/* actually transfered. In this case, IL is not indicated for a CCW */
151-
/* Format 0 or for a CCW Format 1 when IL Suppression Mode is in */
152-
/* effect */
153-
/*-------------------------------------------------------------------*/
141+
/*-------------------------------------------------------------------*/
142+
/* Ivan Warren 20040227 */
143+
/* */
144+
/* This table is used by channel.c to determine if a CCW code */
145+
/* is an immediate command or not. */
146+
/* */
147+
/* The table is addressed in the DEVHND structure as 'DEVIMM immed' */
148+
/* */
149+
/* 0: ("false") Command is *NOT* an immediate command */
150+
/* 1: ("true") Command *IS* an immediate command */
151+
/* */
152+
/* Note: An immediate command is defined as a command which returns */
153+
/* CE (channel end) during initialization (that is, no data is */
154+
/* actually transfered). In this case, IL is not indicated for a */
155+
/* Format 0 or Format 1 CCW when IL Suppression Mode is in effect. */
156+
/* */
157+
/*-------------------------------------------------------------------*/
154158

155159
static BYTE commadpt_immed_command[256]=
156160
{ 0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,

‎ctc_ctci.c

+14-10
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,20 @@
6161

6262
/*-------------------------------------------------------------------*/
6363
/* Ivan Warren 20040227 */
64-
/* This table is used by channel.c to determine if a CCW code is an */
65-
/* immediate command or not */
66-
/* The tape is addressed in the DEVHND structure as 'DEVIMM immed' */
67-
/* 0 : Command is NOT an immediate command */
68-
/* 1 : Command is an immediate command */
69-
/* Note : An immediate command is defined as a command which returns */
70-
/* CE (channel end) during initialisation (that is, no data is */
71-
/* actually transfered. In this case, IL is not indicated for a CCW */
72-
/* Format 0 or for a CCW Format 1 when IL Suppression Mode is in */
73-
/* effect */
64+
/* */
65+
/* This table is used by channel.c to determine if a CCW code */
66+
/* is an immediate command or not. */
67+
/* */
68+
/* The table is addressed in the DEVHND structure as 'DEVIMM immed' */
69+
/* */
70+
/* 0: ("false") Command is *NOT* an immediate command */
71+
/* 1: ("true") Command *IS* an immediate command */
72+
/* */
73+
/* Note: An immediate command is defined as a command which returns */
74+
/* CE (channel end) during initialization (that is, no data is */
75+
/* actually transfered). In this case, IL is not indicated for a */
76+
/* Format 0 or Format 1 CCW when IL Suppression Mode is in effect. */
77+
/* */
7478
/*-------------------------------------------------------------------*/
7579

7680
static BYTE CTCI_Immed_Commands[256]=

‎printer.c

+14-10
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,20 @@
1919

2020
/*-------------------------------------------------------------------*/
2121
/* Ivan Warren 20040227 */
22-
/* This table is used by channel.c to determine if a CCW code is an */
23-
/* immediate command or not */
24-
/* The tape is addressed in the DEVHND structure as 'DEVIMM immed' */
25-
/* 0 : Command is NOT an immediate command */
26-
/* 1 : Command is an immediate command */
27-
/* Note : An immediate command is defined as a command which returns */
28-
/* CE (channel end) during initialisation (that is, no data is */
29-
/* actually transfered. In this case, IL is not indicated for a CCW */
30-
/* Format 0 or for a CCW Format 1 when IL Suppression Mode is in */
31-
/* effect */
22+
/* */
23+
/* This table is used by channel.c to determine if a CCW code */
24+
/* is an immediate command or not. */
25+
/* */
26+
/* The table is addressed in the DEVHND structure as 'DEVIMM immed' */
27+
/* */
28+
/* 0: ("false") Command is *NOT* an immediate command */
29+
/* 1: ("true") Command *IS* an immediate command */
30+
/* */
31+
/* Note: An immediate command is defined as a command which returns */
32+
/* CE (channel end) during initialization (that is, no data is */
33+
/* actually transfered). In this case, IL is not indicated for a */
34+
/* Format 0 or Format 1 CCW when IL Suppression Mode is in effect. */
35+
/* */
3236
/*-------------------------------------------------------------------*/
3337

3438
/* Printer Specific : 1403 */

‎service.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -716,8 +716,7 @@ U32 residual; /* Residual data count */
716716
/* SCP to issue a SCLP_READ_EVENT_DATA service call to retrieve */
717717
/* the input data. */
718718
/*-------------------------------------------------------------------*/
719-
SERV_DLL_IMPORT
720-
void sclp_sysg_attention()
719+
DLL_EXPORT void sclp_sysg_attention()
721720
{
722721

723722
OBTAIN_INTLOCK(NULL);

‎tapeccws.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ BYTE TapeCommands9347 [256] =
323323
/* This table is used by channel.c to determine if a CCW code */
324324
/* is an immediate command or not. */
325325
/* */
326-
/* The tape is addressed in the DEVHND structure as 'DEVIMM immed' */
326+
/* The table is addressed in the DEVHND structure as 'DEVIMM immed' */
327327
/* */
328328
/* 0: ("false") Command is *NOT* an immediate command */
329329
/* 1: ("true") Command *IS* an immediate command */

0 commit comments

Comments
 (0)
Please sign in to comment.