perl 5.003_05: unixish.h

[p5sagit/p5-mst-13.2.git] / perl.c

diff --git a/perl.c b/perl.c
index 0f2c2c1..38c4f07 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -15,11 +15,10 @@
 #include "perl.h"
 #include "patchlevel.h"
 
-/* Omit -- it causes too much grief on mixed systems.
+/* XXX If this causes problems, set i_unistd=undef in the hint file.  */
 #ifdef I_UNISTD
 #include <unistd.h>
 #endif
-*/
 
 dEXT char rcsid[] = "perl.c\nPatch level: ###\n";
 
@@ -35,10 +34,6 @@ dEXT char rcsid[] = "perl.c\nPatch level: ###\n";
 #endif
 #endif
 
-#ifndef OSNAME
-#define OSNAME "unknown"
-#endif
-
 static void find_beginning _((void));
 static void incpush _((char *));
 static void init_ids _((void));
@@ -126,10 +121,12 @@ register PerlInterpreter *sv_interp;
     init_ids();
 
 #if defined(SUBVERSION) && SUBVERSION > 0
-    sprintf(patchlevel, "%7.5f", 5.0 + (PATCHLEVEL / 1000.0)
-                                    + (SUBVERSION / 100000.0));
+    sprintf(patchlevel, "%7.5f",   (double) 5 
+                               + ((double) PATCHLEVEL / (double) 1000)
+                               + ((double) SUBVERSION / (double) 100000));
 #else
-    sprintf(patchlevel, "%5.3f", 5.0 + (PATCHLEVEL / 1000.0));
+    sprintf(patchlevel, "%5.3f", (double) 5 +
+                               ((double) PATCHLEVEL / (double) 1000));
 #endif
 
 #if defined(LOCAL_PATCH_COUNT)
@@ -2123,6 +2120,9 @@ init_perllib()
            incpush(getenv("PERLLIB"));
     }
 
+/* Use the ~-expanded versions of APPLIB (undocumented),
+    ARCHLIB PRIVLIB SITEARCH SITELIB and OLDARCHLIB
+*/
 #ifdef APPLLIB_EXP
     incpush(APPLLIB_EXP);
 #endif