X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Frpmatch.c;h=ba8bc4ce93925e753448120035e3137f41c2c6d9;hb=2ddb59ff29a52f07859d76eeb92dc7cfded8bbc6;hp=02c2abdb884237bd9e5475f1be79512367340f8c;hpb=f9fa25dca3c78a2298e466e1b33caca0ee7e458b;p=gnulib.git

diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index 02c2abdb8..ba8bc4ce9 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, 2000, 2002 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
@@ -14,26 +14,18 @@
 
    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
+#ifdef HAVE_CONFIG_H
 # 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>
-# if HAVE_LIMITS_H
-#  include <limits.h>
-# endif
+# include <limits.h>
 # include <regex.h>
 # include "gettext.h"
 # define _(msgid) gettext (msgid)