[win32] merge change#886 from maintbranch

p4raw-link: @886 on //depot/maint-5.004/perl: 6dba07070c2cb08ffbc6e00eff60e8f5fc9a7ee8

p4raw-id: //depot/win32/perl@936

3 files changed, 25 insertions, 22 deletions

diff --git a/ext/DynaLoader/dl_hpux.xs b/ext/DynaLoader/dl_hpux.xs
index 51d464e6de..a82e0eac11 100644
--- a/ext/DynaLoader/dl_hpux.xs
+++ b/ext/DynaLoader/dl_hpux.xs
@@ -65,6 +65,9 @@ dl_load_file(filename, flags=0)
        * unresolved references in situations like this.  */
       /* bind_type = BIND_IMMEDIATE|BIND_NONFATAL; */
     }
+    /* BIND_NOSTART removed from bind_type because it causes the shared library's	*/
+    /* initialisers not to be run.  This causes problems with all of the static objects */
+    /* in the library.	   */
 #ifdef DEBUGGING
     if (dl_debug)
 	bind_type |= BIND_VERBOSE;
@@ -74,14 +77,14 @@ dl_load_file(filename, flags=0)
     for (i = 0; i <= max; i++) {
 	char *sym = SvPVX(*av_fetch(dl_resolve_using, i, 0));
 	DLDEBUG(1,PerlIO_printf(PerlIO_stderr(), "dl_load_file(%s) (dependent)\n", sym));
-	obj = shl_load(sym, bind_type | BIND_NOSTART, 0L);
+	obj = shl_load(sym, bind_type, 0L);
 	if (obj == NULL) {
 	    goto end;
 	}
     }
 
     DLDEBUG(1,PerlIO_printf(PerlIO_stderr(), "dl_load_file(%s): ", filename));
-    obj = shl_load(filename, bind_type | BIND_NOSTART, 0L);
+    obj = shl_load(filename, bind_type, 0L);
 
     DLDEBUG(2,PerlIO_printf(PerlIO_stderr(), " libref=%x\n", obj));
 end:
diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs
index e1d68332fb..1dba9a61f8 100644
--- a/ext/POSIX/POSIX.xs
+++ b/ext/POSIX/POSIX.xs
@@ -2289,55 +2289,55 @@ constant(char *name, int arg)
     case '_':
 	if (strnEQ(name, "_PC_", 4)) {
 	    if (strEQ(name, "_PC_CHOWN_RESTRICTED"))
-#ifdef _PC_CHOWN_RESTRICTED
+#if defined(_PC_CHOWN_RESTRICTED) || HINT_SC_EXIST
 		return _PC_CHOWN_RESTRICTED;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_PC_LINK_MAX"))
-#ifdef _PC_LINK_MAX
+#if defined(_PC_LINK_MAX) || HINT_SC_EXIST
 		return _PC_LINK_MAX;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_PC_MAX_CANON"))
-#ifdef _PC_MAX_CANON
+#if defined(_PC_MAX_CANON) || HINT_SC_EXIST
 		return _PC_MAX_CANON;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_PC_MAX_INPUT"))
-#ifdef _PC_MAX_INPUT
+#if defined(_PC_MAX_INPUT) || HINT_SC_EXIST
 		return _PC_MAX_INPUT;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_PC_NAME_MAX"))
-#ifdef _PC_NAME_MAX
+#if defined(_PC_NAME_MAX) || HINT_SC_EXIST
 		return _PC_NAME_MAX;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_PC_NO_TRUNC"))
-#ifdef _PC_NO_TRUNC
+#if defined(_PC_NO_TRUNC) || HINT_SC_EXIST
 		return _PC_NO_TRUNC;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_PC_PATH_MAX"))
-#ifdef _PC_PATH_MAX
+#if defined(_PC_PATH_MAX) || HINT_SC_EXIST
 		return _PC_PATH_MAX;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_PC_PIPE_BUF"))
-#ifdef _PC_PIPE_BUF
+#if defined(_PC_PIPE_BUF) || HINT_SC_EXIST
 		return _PC_PIPE_BUF;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_PC_VDISABLE"))
-#ifdef _PC_VDISABLE
+#if defined(_PC_VDISABLE) || HINT_SC_EXIST
 		return _PC_VDISABLE;
 #else
 		goto not_there;
@@ -2463,61 +2463,61 @@ constant(char *name, int arg)
 	}
 	if (strnEQ(name, "_SC_", 4)) {
 	    if (strEQ(name, "_SC_ARG_MAX"))
-#ifdef _SC_ARG_MAX
+#if defined(_SC_ARG_MAX) || HINT_SC_EXIST
 		return _SC_ARG_MAX;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_SC_CHILD_MAX"))
-#ifdef _SC_CHILD_MAX
+#if defined(_SC_CHILD_MAX) || HINT_SC_EXIST
 		return _SC_CHILD_MAX;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_SC_CLK_TCK"))
-#ifdef _SC_CLK_TCK
+#if defined(_SC_CLK_TCK) || HINT_SC_EXIST
 		return _SC_CLK_TCK;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_SC_JOB_CONTROL"))
-#ifdef _SC_JOB_CONTROL
+#if defined(_SC_JOB_CONTROL) || HINT_SC_EXIST
 		return _SC_JOB_CONTROL;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_SC_NGROUPS_MAX"))
-#ifdef _SC_NGROUPS_MAX
+#if defined(_SC_NGROUPS_MAX) || HINT_SC_EXIST
 		return _SC_NGROUPS_MAX;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_SC_OPEN_MAX"))
-#ifdef _SC_OPEN_MAX
+#if defined(_SC_OPEN_MAX) || HINT_SC_EXIST
 		return _SC_OPEN_MAX;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_SC_SAVED_IDS"))
-#ifdef _SC_SAVED_IDS
+#if defined(_SC_SAVED_IDS) || HINT_SC_EXIST
 		return _SC_SAVED_IDS;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_SC_STREAM_MAX"))
-#ifdef _SC_STREAM_MAX
+#if defined(_SC_STREAM_MAX) || HINT_SC_EXIST
 		return _SC_STREAM_MAX;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_SC_TZNAME_MAX"))
-#ifdef _SC_TZNAME_MAX
+#if defined(_SC_TZNAME_MAX) || HINT_SC_EXIST
 		return _SC_TZNAME_MAX;
 #else
 		goto not_there;
 #endif
 	    if (strEQ(name, "_SC_VERSION"))
-#ifdef _SC_VERSION
+#if defined(_SC_VERSION) || HINT_SC_EXIST
 		return _SC_VERSION;
 #else
 		goto not_there;
diff --git a/ext/POSIX/hints/linux.pl b/ext/POSIX/hints/linux.pl
index 7994f24023..f1d19814ae 100644
--- a/ext/POSIX/hints/linux.pl
+++ b/ext/POSIX/hints/linux.pl
@@ -2,4 +2,4 @@
 # Thanks to Bart Schuller <schuller@Lunatech.com>
 # See Message-ID: <19971009002636.50729@tanglefoot>
 #  XXX A Configure test is needed.
-$self->{CCFLAGS} = $Config{ccflags} . ' -DSTRUCT_TM_HASZONE' ;
+$self->{CCFLAGS} = $Config{ccflags} . ' -DSTRUCT_TM_HASZONE -DHINT_SC_EXIST' ;