aboutsummaryrefslogtreecommitdiff
path: root/resolv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-10 04:40:02 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-10 04:40:02 +0000
commit835bf8e0163b563e0d7a5cd8b435141d7a58b946 (patch)
tree6c4c7ad05874dc92a3fcb6cf072ff2c80307d1e4 /resolv
parentd3436b3cc3d96539a9cc4208c1fb21d854f46c64 (diff)
downloadglibc-835bf8e0163b563e0d7a5cd8b435141d7a58b946.tar
glibc-835bf8e0163b563e0d7a5cd8b435141d7a58b946.tar.gz
glibc-835bf8e0163b563e0d7a5cd8b435141d7a58b946.tar.bz2
glibc-835bf8e0163b563e0d7a5cd8b435141d7a58b946.zip
Update.
2000-08-01 Mark Kettenis <kettenis@gnu.org> * sysdeps/unix/sysv/linux/i386/sys/elf.h (elf_greg_t, ELF_NGREG, elf_gregset_t, elf_fpregset_t, elf_fpxregset_t): Moved to sysdeps/unix/sysv/linux/i386/sys/procfs.h. Remove the junk that's only relevant in the Linux kernel itself. Add a warning saying that this file is now obsolete, and include <sys/procfs.h>. * sysdeps/unix/sysv/linux/i386/sys/procfs.h (elf_greg_t, ELF_NGREG, elf_gregset_t, elf_fpregset_t, elf_fpxregset_t): Moved here from sysdeps/unix/sysv/linux/i386/sys/elf.h. Don't include <signal.h>, <sys/ucontext.h> and <sys/elf.h>. Remove parts of `struct elf_prstatus' that are #ifdef'ed out. Improve comments and add the notice that the file is primarily there for GDB. * sysdeps/unix/sysv/linux/i386/sys/user.h: Fix comment. 2000-08-09 Jakub Jelinek <jakub@redhat.com> * time/tzfile.c (__tzfile_compute): __tzstring zones from zone_names. 2000-08-09 Jakub Jelinek <jakub@redhat.com> * resolv/resolv.h (__res_state): Surround prototype with __BEGIN_DECLS/__END_DECLS. * sysdeps/unix/sysv/linux/m68k/chown.c: Include kernel-features.h. 2000-08-04 Jes Sorensen <jes@linuxcare.com> * sysdeps/unix/sysv/linux/ia64/bits/resource.h (__rlimit_resource): Make independant of asm/resource.h from the Linux kernel. 2000-08-06 Bruno Haible <haible@clisp.cons.org> * iconv/gconv_conf.c (__gconv_read_conf): Don't call realpath. 2000-08-06 Bruno Haible <haible@clisp.cons.org> * intl/Makefile (CPPFLAGS): Remove $(i18ndir) from LOCALE_ALIAS_PATH. * locale/Makefile (locale-CPPFLAGS): Likewise. 2000-08-09 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/fpu/libm-test-ulps: Increase several error values for AMD processors. 2000-08-03 Jakub Jelinek <jakub@redhat.com> * misc/Versions (mincore): Export at GLIBC_2.2. 2000-08-03 Bruno Haible <haible@clisp.cons.org> * intl/libintl.h (gettext, dgettext, dcgettext): Add back __THROW.
Diffstat (limited to 'resolv')
-rw-r--r--resolv/resolv.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/resolv/resolv.h b/resolv/resolv.h
index 74a55ef0fb..6677adde3b 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -1,7 +1,7 @@
/*
* Copyright (c) 1983, 1987, 1989
* The Regents of the University of California. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -13,7 +13,7 @@
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -216,7 +216,9 @@ typedef struct __res_state *res_state;
/* Things involving an internal (static) resolver context. */
#if !defined _LIBC || defined _LIBC_REENTRANT
+__BEGIN_DECLS
extern struct __res_state *__res_state(void) __attribute__ ((__const__));
+__END_DECLS
#define _res (*__res_state())
#else
#ifndef __BIND_NOSTATIC
@@ -259,7 +261,7 @@ __END_DECLS
#if !defined(SHARED_LIBBIND) || defined(LIB)
/*
* If libbind is a shared object (well, DLL anyway)
- * these externs break the linker when resolv.h is
+ * these externs break the linker when resolv.h is
* included by a lib client (like named)
* Make them go away if a client is including this
*