X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargmatch.h;h=43ea5dbf4513fc870723d7b465d627b5ed8d5a35;hb=1cc4ba44c23782d32d4d2986b355e336f5e21335;hp=cbd6ce155a96eaa9721de37811f766860e2afdad;hpb=34411e9e59c2820e440ae76755bc9b086a36d90f;p=gnulib.git

diff --git a/lib/argmatch.h b/lib/argmatch.h
index cbd6ce155..43ea5dbf4 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 *program_name;