From: Andy Dougherty <doughera@lafayette.edu>
Date: Thu, 2 Apr 1998 11:56:51 +0000 (-0500)
Subject: Config_63-04-05.diff
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a1896f58c36512e60681e1b3d5e3658044b57e2d;p=p5sagit%2Fp5-mst-13.2.git

Config_63-04-05.diff

p4raw-id: //depot/perl@862
---

diff --git a/Configure b/Configure
index 461670a..4430ece 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Tue Mar 31 15:49:57 EST 1998 [metaconfig 3.0 PL70]
+# Generated on Thu Apr  2 09:30:50 EST 1998 [metaconfig 3.0 PL70]
 
 cat >/tmp/c1$$ <<EOF
 ARGGGHHHH!!!!!
@@ -6141,7 +6141,7 @@ $cat >try.c <<EOCP
 #include <stdio.h>
 #include <sys/types.h>
 #include <signal.h>
-$signal_t blech() { exit(3); }
+$signal_t blech(s) int s; { exit(3); }
 main()
 {
 	$xxx i32;
@@ -6191,8 +6191,8 @@ $cat >try.c <<EOCP
 #include <stdio.h>
 #include <sys/types.h>
 #include <signal.h>
-$signal_t blech() { exit(7); }
-$signal_t blech_in_list() { exit(4); }
+$signal_t blech(s) int s; { exit(7); }
+$signal_t blech_in_list(s) int s; { exit(4); }
 unsigned long dummy_long(p) unsigned long p; { return p; }
 unsigned int dummy_int(p) unsigned int p; { return p; }
 unsigned short dummy_short(p) unsigned short p; { return p; }
diff --git a/ext/Socket/Socket.xs b/ext/Socket/Socket.xs
index 3664368..823e704 100644
--- a/ext/Socket/Socket.xs
+++ b/ext/Socket/Socket.xs
@@ -323,8 +323,14 @@ constant(char *name, int arg)
     case 'L':
 	break;
     case 'M':
+	if (strEQ(name, "MSG_CTRUNC"))
+#if defined(MSG_CTRUNC) || defined(HAS_GNULIBC) /* XXX it's an enum */
+	    return MSG_CTRUNC;
+#else
+	    goto not_there;
+#endif
 	if (strEQ(name, "MSG_DONTROUTE"))
-#ifdef MSG_DONTROUTE
+#if defined(MSG_DONTROUTE) || defined(HAS_GNULIBC) /* XXX it's an enum */
 	    return MSG_DONTROUTE;
 #else
 	    goto not_there;
@@ -336,17 +342,23 @@ constant(char *name, int arg)
 	    goto not_there;
 #endif
 	if (strEQ(name, "MSG_OOB"))
-#ifdef MSG_OOB
+#if defined(MSG_OOB) || defined(HAS_GNULIBC) /* XXX it's an enum */
 	    return MSG_OOB;
 #else
 	    goto not_there;
 #endif
 	if (strEQ(name, "MSG_PEEK"))
-#ifdef MSG_PEEK
+#if defined(MSG_PEEK) || defined(HAS_GNULIBC) /* XXX it's an enum */
 	    return MSG_PEEK;
 #else
 	    goto not_there;
 #endif
+	if (strEQ(name, "MSG_PROXY"))
+#if defined(MSG_PROXY) || defined(HAS_GNULIBC) /* XXX it's an enum */
+	    return MSG_PROXY;
+#else
+	    goto not_there;
+#endif
 	break;
     case 'N':
 	break;
diff --git a/myconfig b/myconfig
index 3fff7ef..c143aea 100755
--- a/myconfig
+++ b/myconfig
@@ -39,4 +39,5 @@ Summary of my $package ($baserev patchlevel $PATCHLEVEL subversion $SUBVERSION)
   Dynamic Linking:
     dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun, ccdlflags='$ccdlflags'
     cccdlflags='$cccdlflags', lddlflags='$lddlflags'
+
 !GROK!THIS!