Avoid declaring sys_siglist and sys_errlist as non-const, not only on

BSD but also on Linux.

3 files changed, 17 insertions, 17 deletions

diff --git a/sysutils/socket/distinfo b/sysutils/socket/distinfo
index f4cf91a09a1..cd221ee83ba 100644
--- a/sysutils/socket/distinfo
+++ b/sysutils/socket/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:08 agc Exp $
+$NetBSD: distinfo,v 1.3 2004/05/10 16:36:33 minskim Exp $
 
 SHA1 (socket-1.1.tar.gz) = 1ada9bc6d949c303734030b3a34e2d6f0544d1db
 Size (socket-1.1.tar.gz) = 14426 bytes
 SHA1 (patch-aa) = a2f567f4e27e18a333eeac46d1eb9c3033a7344f
 SHA1 (patch-ab) = a57ef3243601007113f07493201804a6050f3182
-SHA1 (patch-ac) = ae38cf5abfe6fcf252f2384cc718412fe86f4e48
+SHA1 (patch-ac) = e793500a60693e53ad145f9ade1b449f102212e6
 SHA1 (patch-ad) = 034f34565952f94b4e12cf78f0bb9b5612091e4d
-SHA1 (patch-ae) = e238447cf72ddfe25f40a4e7e3276485001ec26b
+SHA1 (patch-ae) = 97bbe5066b8bf00fe45df1c1088768400abf102e
 SHA1 (patch-af) = b40a7bbd22a6773816eb0e52403d67317979451d
 SHA1 (patch-ag) = e106aac5b193a43ab208b648deadf173a78a6d6d
 SHA1 (patch-ah) = 03a996a5d1a40cf573882b842d94d24b226f74ca
diff --git a/sysutils/socket/patches/patch-ac b/sysutils/socket/patches/patch-ac
index 5fa0e86f466..8e50bba67d3 100644
--- a/sysutils/socket/patches/patch-ac
+++ b/sysutils/socket/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 1999/09/17 18:23:55 tron Exp $
+$NetBSD: patch-ac,v 1.3 2004/05/10 16:36:33 minskim Exp $
 
---- globals.h.orig	Thu Sep 16 13:52:37 1999
-+++ globals.h	Thu Sep 16 12:45:24 1999
-@@ -8,6 +8,10 @@
+--- globals.h.orig	1992-08-30 14:04:27.000000000 -0500
++++ globals.h
+@@ -8,6 +8,10 @@ Please read the file COPYRIGHT for furth
  */
  
  #include "patchlevel.h"
@@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.2 1999/09/17 18:23:55 tron Exp $
  
  /* globals for socket */
  
-@@ -22,9 +26,16 @@
+@@ -22,9 +26,16 @@ Please read the file COPYRIGHT for furth
  #define A(args) ()
  #endif
  
@@ -30,12 +30,12 @@ $NetBSD: patch-ac,v 1.2 1999/09/17 18:23:55 tron Exp $
  void catchsig A((int sig)) ;
  void usage A((void)) ;
  int do_read_write A((int from, int to)) ;
-@@ -49,4 +60,7 @@
+@@ -49,4 +60,7 @@ extern int quitflag ;
  extern int crlfflag ;
  extern int active_socket ;
  extern char *progname ;
 -extern char *sys_errlist[], *sys_siglist[] ;
 +
-+#if !(defined(BSD) && (BSD >=199306))
++#if !(defined(BSD) && (BSD >=199306)) && !defined(__linux__)
 +     extern char *sys_errlist[], *sys_siglist[] ;
 +#endif
diff --git a/sysutils/socket/patches/patch-ae b/sysutils/socket/patches/patch-ae
index bc6e55ef3ed..1b0204e0c05 100644
--- a/sysutils/socket/patches/patch-ae
+++ b/sysutils/socket/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 1999/02/02 23:00:41 tron Exp $
+$NetBSD: patch-ae,v 1.2 2004/05/10 16:36:33 minskim Exp $
 
---- siglist.c.orig	Sun Aug 30 15:50:48 1992
-+++ siglist.c	Tue Feb  2 23:58:03 1999
-@@ -23,6 +23,7 @@
+--- siglist.c.orig	1992-08-30 08:50:48.000000000 -0500
++++ siglist.c
+@@ -23,6 +23,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 
  
  #include <stdio.h>
  #include <signal.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.1 1999/02/02 23:00:41 tron Exp $
  
  #if !defined (NSIG)
  #  if defined (_NSIG)
-@@ -32,12 +33,17 @@
+@@ -32,12 +33,17 @@ Foundation, 675 Mass Ave, Cambridge, MA 
  #  endif /* !_NSIG */
  #endif /* !NSIG */
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.1 1999/02/02 23:00:41 tron Exp $
 +#endif
  
 -extern *malloc ();
-+#if !(defined(BSD) && (BSD >=199306))
++#if !(defined(BSD) && (BSD >=199306)) && !defined(__linux__)
 +char *sys_siglist[NSIG];
 +#endif
  
@@ -31,7 +31,7 @@ $NetBSD: patch-ae,v 1.1 1999/02/02 23:00:41 tron Exp $
    register int i;
  
    for (i = 0; i < NSIG; i++)
-@@ -219,4 +225,5 @@
+@@ -219,4 +225,5 @@ initialize_siglist ()
  	  sprintf (sys_siglist[i], "Unknown Signal #%d", i);
  	}
      }