* inet/getnetbynm_r.c: Likewise.
* inet/getnetent.c: Likewise.
* inet/getnetbyad_r.c: Likewise.
* inet/getnetbyad.c: Likewise.
* inet/getnetbynm.c: Likewise.
* sysdeps/generic/pselect.c: Include <sys/time.h>.
* misc/sys/select.h: Include <time.h> instead of <sys/time.h> for
`struct timespec'.
Thu Jul 11 20:09:55 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
+ * inet/getnetent_r.c: Define NEED_H_ERRNO.
+ * inet/getnetbynm_r.c: Likewise.
+ * inet/getnetent.c: Likewise.
+ * inet/getnetbyad_r.c: Likewise.
+ * inet/getnetbyad.c: Likewise.
+ * inet/getnetbynm.c: Likewise.
+
+ * sysdeps/generic/pselect.c: Include <sys/time.h>.
+
+ * misc/sys/select.h: Include <time.h> instead of <sys/time.h> for
+ `struct timespec'.
+
* math/Makefile (calls): Add s_frexp, s_ldexp.
(routines): Remove them and &f from here.
#define ADD_PARAMS unsigned long int net, int type
#define ADD_VARIABLES net, type
#define BUFLEN 1024
+#define NEED_H_ERRNO 1
#include "../nss/getXXbyYY.c"
#define ADD_PARAMS unsigned long int net, int type
#define ADD_VARIABLES net, type
#define NEED__RES 1
+#define NEED_H_ERRNO 1
#include "../nss/getXXbyYY_r.c"
#define ADD_PARAMS const char *name
#define ADD_VARIABLES name
#define BUFLEN 1024
+#define NEED_H_ERRNO 1
#include "../nss/getXXbyYY.c"
#define ADD_PARAMS const char *name
#define ADD_VARIABLES name
#define NEED__RES 1
+#define NEED_H_ERRNO 1
#include "../nss/getXXbyYY_r.c"
#define LOOKUP_TYPE struct netent
#define GETFUNC_NAME getnetent
#define BUFLEN 1024
+#define NEED_H_ERRNO 1
#include "../nss/getXXent.c"
#define STAYOPEN int stayopen
#define STAYOPEN_VAR stayopen
#define NEED__RES 1
+#define NEED_H_ERRNO 1
#include "../nss/getXXent_r.c"
#endif
#if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+# endif
# include <string.h>
#else
# include <strings.h>
int category;
{
#ifndef HAVE_ALLOCA
- struct block_list *alloca_list = NULL;
+ struct block_list *block_list = NULL;
#endif
struct loaded_l10nfile *domain;
struct binding *binding;
/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+This file is part of the GNU C Library. Its master source is NOT part of
+the C library, however. The master source lives in /gd/gnu/lib.
+
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include "loadinfo.h"
+/* On some strange systems still no definition of NULL is found. Sigh! */
+#ifndef NULL
+# if defined __STDC__ && __STDC__
+# define NULL ((void *) 0)
+# else
+# define NULL 0
+# endif
+#endif
+
+/* @@ end of prolog @@ */
+
int
_nl_explode_name (name, language, modifier, territory, codeset,
normalized_codeset, special, sponsor, revision)
enum { undecided, xpg, cen } syntax;
char *cp;
int mask;
-
+
*modifier = NULL;
*territory = NULL;
*codeset = NULL;
# include <config.h>
#endif
-#if defined _LIBC && (defined __ARGZ_COUNT || defined __ARGZ_STRINGIFY)
+#if defined _LIBC || defined HAVE_ARGZ_H
# include <argz.h>
#endif
#include <ctype.h>
#endif
#if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+# endif
# include <string.h>
#else
# include <strings.h>
#include "loadinfo.h"
+/* On some strange systems still no definition of NULL is found. Sigh! */
+#ifndef NULL
+# if defined __STDC__ && __STDC__
+# define NULL ((void *) 0)
+# else
+# define NULL 0
+# endif
+#endif
+
/* @@ end of prolog @@ */
#ifdef _LIBC
/* Define function which are usually not available. */
-#if !defined _LIBC && !defined __ARGZ_COUNT
+#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
/* Returns the number of strings in ARGZ. */
-static size_t __argz_count PARAMS ((const char *argz, size_t len));
+static size_t argz_count__ PARAMS ((const char *argz, size_t len));
static size_t
-__argz_count (argz, len)
+argz_count__ (argz, len)
const char *argz;
size_t len;
{
}
return count;
}
-#endif /* !_LIBC && !__ARGZ_COUNT */
+# undef __argz_count
+# define __argz_count(argz, len) argz_count__ (argz, len)
+#endif /* !_LIBC && !HAVE___ARGZ_COUNT */
-#if !defined _LIBC && !defined __ARGZ_STRINGIFY
+#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
except the last into the character SEP. */
-static void __argz_stringify PARAMS ((char *argz, size_t len, int sep));
+static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
static void
-__argz_stringify (argz, len, sep)
+argz_stringify__ (argz, len, sep)
char *argz;
size_t len;
int sep;
*argz++ = sep;
}
}
-#endif /* !_LIBC && !__ARGZ_COUNT */
+# undef __argz_stringify
+# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
+#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
+
+#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
+static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
+ const char *entry));
-#if !defined _LIBC && !defined __ARGZ_NEXT
static char *
-__argz_next (argz, argz_len, entry)
+argz_next__ (argz, argz_len, entry)
char *argz;
size_t argz_len;
const char *entry;
else
return 0;
}
-#endif
+# undef __argz_next
+# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
+#endif /* !_LIBC && !HAVE___ARGZ_NEXT */
/* Return number of bits set in X. */
#endif
#if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+# endif
# include <string.h>
#else
# include <strings.h>
free (old); \
} \
} while (0)
+# undef alloca
+# define alloca(size) (malloc (size))
#endif /* have alloca */
int fname_len;
{
#ifndef HAVE_ALLOCA
- struct block_list *alloca_list = NULL;
+ struct block_list *block_list = NULL;
#endif
FILE *fp;
char *full_fname;
/* POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h> */
-#ifndef __SYS_SELECT_H
+#ifndef _SYS_SELECT_H
-#define __SYS_SELECT_H 1
+#define _SYS_SELECT_H 1
#include <features.h>
/* Get definition of needed basic types. */
/* Get definition of timer specification structures. */
#define __need_timespec
-#include <sys/time.h>
+#include <time.h>
__BEGIN_DECLS
Boston, MA 02111-1307, USA. */
#include <errno.h>
+#include <sys/time.h>
#include <sys/select.h>
/* Check the first NFDS descriptors each in READFDS (if not NULL) for read