X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frpmatch.c;h=e5f79f8228a34329ce20a4130e49b57b56e8e759;hb=d2b0c77abf5b72cbf78ec4e4e404c851950b0fef;hp=0988f07d04445404b33b340fd57e577679406deb;hpb=c2f78d65241d3711416d2e79d1018dd7aa1bb385;p=gnulib.git

diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index 0988f07d0..e5f79f822 100644
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -1,6 +1,8 @@
 /* Determine whether string value is affirmation or negative response
    according to current locale's data.
-   Copyright (C) 1996, 1998, 2000 Free Software Foundation, Inc.
+
+   Copyright (C) 1996, 1998, 2000, 2002, 2003, 2006 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
@@ -14,29 +16,19 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
-#if STDC_HEADERS || _LIBC
-# include <stddef.h>
-# include <stdlib.h>
-#else
-# ifndef NULL
-#  define NULL 0
-# endif
-#endif
+#include <stddef.h>
+#include <stdlib.h>
 
 #if ENABLE_NLS
 # include <sys/types.h>
-# if HAVE_LIMITS_H
-#  include <limits.h>
-# endif
+# include <limits.h>
 # include <regex.h>
-# include <libintl.h>
-# define _(Text) gettext (Text)
+# include "gettext.h"
+# define _(msgid) gettext (msgid)
 
 static int
 try (const char *response, const char *pattern, const int match,