X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frpmatch.c;h=7ed4ded90296eb4baa32b295cad0c00456ff4e83;hb=cbb86267fda18ba3e409e16cf9c460cbbed1846c;hp=d9c31b598b1c82f69a29f7f1ddf6e5a6b11c6bad;hpb=f8e2674ac086a94e732b36cc1e6d35b7421d355b;p=gnulib.git

diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index d9c31b598..7ed4ded90 100644
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -1,6 +1,6 @@
 /* Determine whether string value is affirmation or negative response
    according to current locale's data.
-   Copyright (C) 1996, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998, 2000, 2002, 2003 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
@@ -20,23 +20,19 @@
 # include <config.h>
 #endif
 
-#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>
+# 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, const int nomatch, const char **lastp, regex_t *re)
+try (const char *response, const char *pattern, const int match,
+     const int nomatch, const char **lastp, regex_t *re)
 {
   if (pattern != *lastp)
     {