Changeset 18

Timestamp:

Sep 21, 2014, 9:48:19 AM (11 years ago)

Author:

Alex Taylor

Message:

Various fixes for switch to ICC v3.65.

Location:

rxutilex/trunk

Files:

• Makefile (modified) (2 diffs)
• readme.txt (modified) (1 diff)
• rxutilex.c (modified) (3 diffs)
• rxutilex.def (modified) (1 diff)

rxutilex/trunk/Makefile

@@ -3 +3 @@
 LINK   = ilink
 RC     = rc
-CFLAGS = /Ss /Q /Wuse /Gm /Gd
+CFLAGS = /Ss /Q /Wuse /Gm
+#CFLAGS = /Ss /Q /Wuse /Gm /Gd
 LFLAGS = /NOLOGO
 NAME   = rxutilex
@@ -17 +18 @@
                 makedesc -D"Extra REXX Utility Functions" -N"Alex Taylor" -V"^#define=SZ_VERSION,rxutilex.c" $(NAME).def
                 $(LINK) $(LFLAGS) $(NAME).obj $(NAME).def $(LIBS) /O:$@
-                @dllrname.exe $@ CPPOM30=OS2OM30 /Q /R
+#                @dllrname.exe $@ CPPOM30=OS2OM30 /Q /R
 
 $(NAME).obj : $(NAME).c $(NAME).def

rxutilex/trunk/readme.txt

@@ -44 +44 @@
 BUILD NOTES
 
-The included Makefile is for the IBM C/C++ compiler.  Version 3.6 or later
-is required in order to support the parsing of 64-bit integers.
+The included Makefile is for the IBM C/C++ compiler.  Version 3.65 is 
+required in order to support the parsing of 64-bit integers.
 
 

rxutilex/trunk/rxutilex.c

@@ -932 +932 @@
     PSZ    pszTZ,                             // Pointer to TZ environment var
            pszSetTZ;
+    int    iEpoch;                            // Input epoch time
     time_t ttSeconds;                         // Input timestamp (seconds)
     struct tm *timeptr;                       // Timestamp structure
@@ -943 +944 @@
     if ( argc >= 1 && RXVALIDSTRING(argv[0]) ) {
         // first argument: epoch time value
-        if (( sscanf( argv[0].strptr, "%d", &ttSeconds )) != 1 ) return ( 40 );
+        if (( sscanf( argv[0].strptr, "%d", &iEpoch )) != 1 ) return ( 40 );
+        ttSeconds = (time_t) iEpoch;
     }
 
@@ -1181 +1183 @@
 
     // Return the calculated time value
-    sprintf( szEpochTime, "%u", timeval );
+#if __IBMC__ >= 360 || __IBMCPP__ >= 360
+    sprintf( szEpochTime, "%.0f", timeval );
+#else
+    sprintf( szEpochTime, "%d", timeval );
+#endif
     MAKERXSTRING( *prsResult, szEpochTime, strlen(szEpochTime) );
 

rxutilex/trunk/rxutilex.def

@@ -1 +1 @@
 LIBRARY     RXUTILEX INITINSTANCE TERMINSTANCE
 DATA        MULTIPLE NONSHARED
-DESCRIPTION '@#Alex Taylor:0.0.5#@##1## 21 Sep 2014 15:39:46     REINFORCE::::::@@Extra REXX Utility Functions'
+DESCRIPTION '@#Alex Taylor:0.0.5#@##1## 21 Sep 2014 16:45:48     REINFORCE::::::@@Extra REXX Utility Functions'
 
 EXPORTS     Sys2LoadFuncs