Don't try to include osconf.h

Remove osconf.h, and older version of lsb_addr_cmp.h (it was renamed, and
the old file wasn't deleted.)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5617 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index 8d4ccc9dbbf68416968107fb4afdd652123f88b1..6fb9f9c3026e023460d3502495828d79f8838eab 100644 (file)
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 28 14:56:39 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+       * lsb_addr_cmp.h: Don't try to include osconf.h
+
 Fri Apr 28 08:24:23 1995  Theodore Y. Ts'o  <tytso@lurch.mit.edu>
 
        * conf.h, conf-*.h: Removed.  We don't need them anymore,

diff --git a/src/include/kerberosIV/lsb_addr_cmp.h b/src/include/kerberosIV/lsb_addr_cmp.h
index 4f867a94f5e2d62e5cea157bd8d338c1b0daaecf..7c9d557257c4ef43a6e871f30bb49fe9de0c263b 100644 (file)
--- a/src/include/kerberosIV/lsb_addr_cmp.h
+++ b/src/include/kerberosIV/lsb_addr_cmp.h
@@ -14,7 +14,7 @@
 #ifndef LSB_ADDR_COMP_DEFS
 #define LSB_ADDR_COMP_DEFS
 
-#include "osconf.h"
+/* #include "osconf.h" */
 
 /* note that if we don't explicitly know if we're LSBFIRST, the 
    alternate code is byte order independent and will give the

diff --git a/src/include/kerberosIV/lsb_addr_comp.h b/src/include/kerberosIV/lsb_addr_comp.h
deleted file mode 100644 (file)
index 43775df..0000000
--- a/src/include/kerberosIV/lsb_addr_comp.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * include/kerberosIV/lsb_addr_comp.h
- *
- * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- *   require a specific license from the United States Government.
- *   It is the responsibility of any person or organization contemplating
- *   export to obtain such a license before exporting.
- * 
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- * 
- * Comparison macros to emulate LSBFIRST comparison results of network
- * byte-order quantities
- */
-
-#ifndef LSB_ADDR_COMP_DEFS
-#define LSB_ADDR_COMP_DEFS
-
-#include "osconf.h"
-
-#ifdef LSBFIRST
-#define lsb_net_ulong_less(x,y) ((x < y) ? -1 : ((x > y) ? 1 : 0))
-#define lsb_net_ushort_less(x,y) ((x < y) ? -1 : ((x > y) ? 1 : 0))
-#else
-/* MSBFIRST */
-#define u_char_comp(x,y) \
-        (((x)>(y))?(1):(((x)==(y))?(0):(-1)))
-/* This is gross, but... */
-#define lsb_net_ulong_less(x, y) long_less_than((u_char *)&x, (u_char *)&y)
-#define lsb_net_ushort_less(x, y) short_less_than((u_char *)&x, (u_char *)&y)
-
-#define long_less_than(x,y) \
-        (u_char_comp((x)[3],(y)[3])?u_char_comp((x)[3],(y)[3]): \
-        (u_char_comp((x)[2],(y)[2])?u_char_comp((x)[2],(y)[2]): \
-         (u_char_comp((x)[1],(y)[1])?u_char_comp((x)[1],(y)[1]): \
-          (u_char_comp((x)[0],(y)[0])))))
-#define short_less_than(x,y) \
-         (u_char_comp((x)[1],(y)[1])?u_char_comp((x)[1],(y)[1]): \
-          (u_char_comp((x)[0],(y)[0])))
-
-#endif /* LSBFIRST */
-
-#endif /*  LSB_ADDR_COMP_DEFS */

diff --git a/src/include/kerberosIV/osconf.h b/src/include/kerberosIV/osconf.h
deleted file mode 100644 (file)
index b619c9d..0000000
--- a/src/include/kerberosIV/osconf.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * include/kerberosIV/osconf.h
- *
- * Copyright 1988, 1994 by the Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- *   require a specific license from the United States Government.
- *   It is the responsibility of any person or organization contemplating
- *   export to obtain such a license before exporting.
- * 
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- * 
- * Athena configuration.
- */
-
-#ifdef __alpha
-#include "conf-osf1alpha.h"
-#else /* !__alpha */
-#ifdef tahoe
-#include "conf-bsdtahoe.h"
-#else /* !tahoe */
-#ifdef vax
-#include "conf-bsdvax.h"
-#else /* !vax */
-#if defined(mips) && defined(ultrix)
-#include "conf-ultmips2.h"
-#else /* !Ultrix MIPS-2 */
-#ifdef ibm032
-#include "conf-bsdibm032.h"
-#else /* !ibm032 */
-#ifdef apollo
-#include "conf-bsdapollo.h"
-#else /* !apollo */
-#ifdef sun
-#ifdef sparc
-#include "conf-bsdsparc.h"
-#else /* sun but not sparc */
-#ifdef i386
-#include "conf-bsd386i.h"
-#else /* sun but not (sparc or 386i) */
-#include "conf-bsdm68k.h"
-#endif /* i386 */
-#endif /* sparc */
-#else /* !sun */
-#ifdef pyr
-#include "conf-pyr.h"
-#endif /* pyr */
-#endif /* sun */
-#endif /* apollo */
-#endif /* ibm032 */
-#endif /* mips */
-#endif /* vax */
-#endif /* tahoe */
-#endif /* alpha */