Changeset 33 for rxutilex/trunk/rxutilex.c

Timestamp:

Jul 11, 2016, 2:44:46 PM (9 years ago)

Author:

Alex Taylor

Message:

Move common functions into shared directory. Rename FUNCTIONS to rxutilex.txt.

File:

• rxutilex/trunk/rxutilex.c (modified) (6 diffs)

rxutilex/trunk/rxutilex.c

@@ -72 +72 @@
 #include <rexxsaa.h>
 
+
+#include "shfuncs.h"
+
+
 #pragma import( DosGetPrty, "DosGetPrty", "DOSCALL1", 9 )
 USHORT APIENTRY16 DosGetPrty( USHORT usScope, PUSHORT pusPriority, USHORT pid );
@@ -83 +87 @@
 
 #define SZ_LIBRARY_NAME         "RXUTILEX"  // Name of this library
-#define SZ_ERROR_NAME           "SYS2ERR"   // REXX variable used to store error codes
+//#define SZ_ERROR_NAME           "SYS2ERR"   // REXX variable used to store error codes
 #define SZ_VERSION              "0.1.3"     // Current version of this library
 
 // Maximum string lengths...
-#define US_COMPOUND_MAXZ        250                                  // ...of a compound variable
+#ifdef NO_SHARED_SOURCE
+    #define US_COMPOUND_MAXZ    250                                  // ...of a compound variable
+    #define US_ERRSTR_MAXZ      250                                  // ...of an error string
+
+    static const char *PSZ_ZERO = "0";
+    static const char *PSZ_ONE = "1";
+#endif
+
 #define US_INTEGER_MAXZ         12                                   // ...of a 32-bit integer string
 #define US_LONGLONG_MAXZ        21                                   // ...of a 64-bit integer string
 #define US_STEM_MAXZ          ( US_COMPOUND_MAXZ - US_INTEGER_MAXZ ) // ...of a stem
-#define US_ERRSTR_MAXZ          250                                  // ...of an error string
 #define US_PIDSTR_MAXZ        ( CCHMAXPATH + 100 )                   // ...of a process information string
 #define US_TIMESTR_MAXZ         256                                  // ...of a formatted time string
@@ -103 +113 @@
 #define FL_TIME_ISO8601         1
 #define FL_TIME_LOCALE          2
-
-static const char *PSZ_ZERO = "0";
-static const char *PSZ_ONE = "1";
 
 // List of functions to be registered by Sys2LoadFuncs or dropped by Sys2DropFuncs
@@ -177 +184 @@
 // Private internal functions
 ULONG GetProcess( PCSZ pszProgram, PSZ pszFullName, PULONG pulPID, PULONG pulPPID, PULONG pulType, PUSHORT pusPriority, PULONG pulCPU );        // 2016-02-20 SHL
-BOOL  SaveResultString( PRXSTRING prsResult, PCSZ pchBytes, ULONG ulBytes );    // 2016-02-20 SHL
-BOOL  WriteStemElement( PCSZ pszStem, ULONG ulIndex, PCSZ pszValue );   // 2016-02-20 SHL
-void  WriteErrorCode( ULONG ulError, PCSZ pszContext ); // 2016-02-20 SHL
+
+#ifdef NO_SHARED_SOURCE
+    BOOL  SaveResultString( PRXSTRING prsResult, PCSZ pchBytes, ULONG ulBytes );    // 2016-02-20 SHL
+    BOOL  WriteStemElement( PCSZ pszStem, ULONG ulIndex, PCSZ pszValue );   // 2016-02-20 SHL
+    void  WriteErrorCode( ULONG ulError, PCSZ pszContext ); // 2016-02-20 SHL
+#endif
 
 // MACROS
@@ -2467 +2477 @@
 
 
+/* MOVED */
+#ifdef NO_SHARED_SOURCE
+
 /* ------------------------------------------------------------------------- *
  * SaveResultString                                                          *
@@ -2594 +2607 @@
 }
 
+#endif