From 168eb7758eaf5d60f777c459cc97aa25c3a844c5 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Tue, 27 May 1997 09:39:25 +0000
Subject: Update from FSF via patch-2.2.93.

---
 lib/argmatch.c | 19 +++++++++++--------
 lib/argmatch.h | 24 +++++++++---------------
 2 files changed, 20 insertions(+), 23 deletions(-)

(limited to 'lib')

diff --git a/lib/argmatch.c b/lib/argmatch.c
index c0708bfbb..aa5593329 100644
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -1,5 +1,5 @@
 /* argmatch.c -- find a match for a string in an array
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,24 +12,27 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* Written by David MacKenzie <djm@ai.mit.edu> */
+/* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
 
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
+#include <argmatch.h>
+
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef STDC_HEADERS
+#if HAVE_STRING_H
 # include <string.h>
+#else
+# include <strings.h>
 #endif
 
-extern char *program_name;
-
 /* If ARG is an unambiguous match for an element of the
    null-terminated array OPTLIST, return the index in OPTLIST
    of the matched element, else -1 if it does not match any element
diff --git a/lib/argmatch.h b/lib/argmatch.h
index cbd6ce155..e95ff62e2 100644
--- a/lib/argmatch.h
+++ b/lib/argmatch.h
@@ -1,18 +1,12 @@
-#ifndef ARGMATCH_H
-#define ARGMATCH_H 1
+/* argmatch.h -- declarations for matching arguments against option lists */
 
-#ifndef __P
-# if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
-#  define __P(args) args
-# else
-#  define __P(args) ()
-# endif  /* GCC.  */
-#endif  /* Not __P.  */
+#if defined __STDC__ || __GNUC__
+# define __ARGMATCH_P(args) args
+#else
+# define __ARGMATCH_P(args) ()
+#endif
 
-int
-  argmatch __P ((const char *arg, const char *const *optlist));
+int argmatch __ARGMATCH_P ((const char *, const char * const *));
+void invalid_arg __ARGMATCH_P ((const char *, const char *, int));
 
-void
-  invalid_arg __P ((const char *kind, const char *value, int problem));
-
-#endif /* ARGMATCH_H */
+extern char const program_name[];
-- 
cgit v1.2.3-54-g00ecf