Changeset a3f0fea in git for resources

Timestamp:

Jan 24, 2019, 1:08:04 PM (5 years ago)

Author:

Reimer Behrends <behrends@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

756676ef1fcf4cff300fb1607a6d21293b253245

Parents:

25fe907e3f7e0d124b25f97832c0b71e96c515e2

Message:

Modify variable declarions for pSingular.

Location:

resources

Files:

• feFopen.cc (modified) (1 diff)
• feFopen.h (modified) (1 diff)
• feResource.cc (modified) (2 diffs)
• feResource.h (modified) (2 diffs)

resources/feFopen.cc

@@ -19 +19 @@
 
 extern "C" {
-void (*WerrorS_callback)(const char *s) = NULL;
-void (*PrintS_callback)(const char *s) = NULL;
-short errorreported=0;
+VAR void (*WerrorS_callback)(const char *s) = NULL;
+VAR void (*PrintS_callback)(const char *s) = NULL;
+VAR short errorreported=0;
 void WerrorS(const char *s)
 {

resources/feFopen.h

@@ -28 +28 @@
 #endif
 
-extern short errorreported;
+EXTERN_VAR short errorreported;
 void    WerrorS(const char *s);
-extern void (*WerrorS_callback)(const char *s);
-extern void (*PrintS_callback)(const char *s);
+EXTERN_VAR void (*WerrorS_callback)(const char *s);
+EXTERN_VAR void (*PrintS_callback)(const char *s);
 
 #ifdef __cplusplus

resources/feResource.cc

@@ -17 +17 @@
 
 
-char* feArgv0 = NULL;
+VAR char* feArgv0 = NULL;
 
 #ifdef AIX_4
@@ -52 +52 @@
 // 1.) '/' characters are replaced by respective directory - separators
 // 2.) ';' characters are replaced by respective path separators
-feResourceConfig_s feResourceConfigs[] =
+VAR feResourceConfig_s feResourceConfigs[] =
 {
   {"SearchPath",    's', feResPath,  NULL,

resources/feResource.h

@@ -30 +30 @@
 typedef feResourceConfig_s * feResourceConfig;
 
-extern feResourceConfig_s feResourceConfigs[];
+EXTERN_VAR feResourceConfig_s feResourceConfigs[];
 
 // returns value of Resource as read-only string, or NULL
@@ -53 +53 @@
 #endif /* end ifdef __cplusplus */
 
-extern char* feArgv0;
+EXTERN_VAR char* feArgv0;
 
 const char fePathSep = ':' ;