about summary refs log tree commit diff
path: root/resolv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-10-16 11:41:15 +0000
committerUlrich Drepper <drepper@redhat.com>1998-10-16 11:41:15 +0000
commitc66dbe00b9c98bb9d1fc10c9007fdcfb98a59b73 (patch)
treefc77f0234b3ff62b6ab6f5840e08226cab294dd4 /resolv
parenta9e73d4044f6c8d238965001baffec1ce603f3f3 (diff)
downloadglibc-c66dbe00b9c98bb9d1fc10c9007fdcfb98a59b73.tar.gz
glibc-c66dbe00b9c98bb9d1fc10c9007fdcfb98a59b73.tar.xz
glibc-c66dbe00b9c98bb9d1fc10c9007fdcfb98a59b73.zip
Update.
1998-10-16 10:07  Ulrich Drepper  <drepper@cygnus.com>

	* iconv/Makefile [! elf]: Define CFLAGS-gconv_simple.c to
	-DSTATIC_GCONV.
	* iconv/skeleton.c: Include ELF header only of STATIC?GCONV is not
	defined.  Avoid using DL_CLL_FCT if it is not defined.

1998-10-16 10:40 -0400  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* resolv/arpa/nameser.h: Include sys/types.h unconditionally.
	Include endian.h unconditionally.  Remove portability goop
	depending on #ifdef linux, #ifdef BSD, #ifdef machine-type.

1998-10-16 11:39 -0400  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* sunrpc/rpc/types.h: Mark file so fixincludes won't modify it.
Diffstat (limited to 'resolv')
-rw-r--r--resolv/arpa/nameser.h54
1 files changed, 4 insertions, 50 deletions
diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h
index 34597500ed..e9bf744ea4 100644
--- a/resolv/arpa/nameser.h
+++ b/resolv/arpa/nameser.h
@@ -83,17 +83,9 @@
 #ifndef _ARPA_NAMESER_H
 #define	_ARPA_NAMESER_H 1
 
+#include <features.h>
 #include <sys/param.h>
-#if (!defined(BSD)) || (BSD < 199306)
-# include <sys/bitypes.h>
-#else
-# include <sys/types.h>
-#endif
-#include <sys/cdefs.h>
-
-#ifdef _AUX_SOURCE
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 /*
  * revision information.  this is the release date in YYYYMMDD format.
@@ -254,46 +246,8 @@
 #define CONV_BADCKSUM	(-3)
 #define CONV_BADBUFLEN	(-4)
 
-#ifndef BYTE_ORDER
-#if (BSD >= 199103)
-# include <machine/endian.h>
-#else
-#ifdef linux
-# include <endian.h>
-#else
-#define LITTLE_ENDIAN	1234	/* least-significant byte first (vax, pc) */
-#define BIG_ENDIAN	4321	/* most-significant byte first (IBM, net) */
-#define PDP_ENDIAN	3412	/* LSB first in word, MSW first in long (pdp)*/
-
-#if defined(vax) || defined(ns32000) || defined(sun386) || defined(i386) || \
-    defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \
-    defined(__alpha__) || defined(__alpha)
-#define BYTE_ORDER	LITTLE_ENDIAN
-#endif
-
-#if defined(sel) || defined(pyr) || defined(mc68000) || defined(sparc) || \
-    defined(is68k) || defined(tahoe) || defined(ibm032) || defined(ibm370) || \
-    defined(MIPSEB) || defined(_MIPSEB) || defined(_IBMR2) || defined(DGUX) ||\
-    defined(apollo) || defined(__convex__) || defined(_CRAY) || \
-    defined(__hppa) || defined(__hp9000) || \
-    defined(__hp9000s300) || defined(__hp9000s700) || \
-    defined (BIT_ZERO_ON_LEFT) || defined(m68k)
-#define BYTE_ORDER	BIG_ENDIAN
-#endif
-#endif /* linux */
-#endif /* BSD */
-#endif /* BYTE_ORDER */
-
-#if !defined(BYTE_ORDER) || \
-    (BYTE_ORDER != BIG_ENDIAN && BYTE_ORDER != LITTLE_ENDIAN && \
-    BYTE_ORDER != PDP_ENDIAN)
-	/* you must determine what the correct bit order is for
-	 * your compiler - the next line is an intentional error
-	 * which will force your compiles to bomb until you fix
-	 * the above macros.
-	 */
-  error "Undefined or invalid BYTE_ORDER";
-#endif
+/* glibc always has byte order info in <endian.h> */
+#include <endian.h>
 
 /*
  * Structure for query header.  The order of the fields is machine- and