From: Hallvard Furuseth Date: Tue, 17 Nov 1998 04:07:31 +0000 (+0000) Subject: Back out K&Rification change; would only be needed in ldap.h and lber.h. X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~1108 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b581bdd23c16761ba6f010c39a153672ba623e50;p=openldap Back out K&Rification change; would only be needed in ldap.h and lber.h. --- diff --git a/include/ac/errno.h b/include/ac/errno.h index de2b033430..b083cbbdf5 100644 --- a/include/ac/errno.h +++ b/include/ac/errno.h @@ -5,10 +5,8 @@ #if defined( HAVE_ERRNO_H ) # include -#else -# if defined( HAVE_SYS_ERRNO_H ) -# include -# endif +#elif defined( HAVE_SYS_ERRNO_H ) +# include #endif #ifdef DECL_SYS_ERRLIST diff --git a/include/ac/krb.h b/include/ac/krb.h index 75113137e0..d371350354 100644 --- a/include/ac/krb.h +++ b/include/ac/krb.h @@ -6,19 +6,15 @@ #if defined( HAVE_KERBEROS ) #if defined( HAVE_KERBEROSIV_KRB_H ) -# include -#else -# if defined( HAVE_KRB_H ) -# include -# endif +#include +#elif defined( HAVE_KRB_H ) +#include #endif #if defined( HAVE_KERBEROSIV_DES_H ) -# include -#else -# if defined( HAVE_DES_H ) -# include -# endif +#include +#elif defined( HAVE_DES_H ) +#include #endif #endif /* HAVE_KERBEROS */ diff --git a/include/ac/socket.h b/include/ac/socket.h index 310402d24d..1527d02e5f 100644 --- a/include/ac/socket.h +++ b/include/ac/socket.h @@ -24,13 +24,11 @@ #endif #ifdef HAVE_WINSOCK2 -# include +#include +#elif HAVE_WINSOCK +#include #else -# if HAVE_WINSOCK -# include -# else -# define WSACleanup() -# endif +#define WSACleanup() #endif #ifdef HAVE_PCNFS diff --git a/include/ac/string.h b/include/ac/string.h index 87c5cb258f..8df4116cff 100644 --- a/include/ac/string.h +++ b/include/ac/string.h @@ -8,10 +8,8 @@ #else # ifdef HAVE_STRING_H # include -# else -# ifdef HAVE_STRINGS_H +# elif HAVE_STRINGS_H # include -# endif # endif # ifndef HAVE_STRCHR @@ -43,17 +41,13 @@ #ifndef SAFEMEMCPY # if defined( HAVE_MEMMOVE ) # define SAFEMEMCPY( d, s, n ) memmove((d), (s), (n)) -# else -# if defined( HAVE_BCOPY ) +# elif defined( HAVE_BCOPY ) # define SAFEMEMCPY( d, s, n ) bcopy((s), (d), (n)) -# else -# if defined( MACOS ) +# elif defined( MACOS ) # define SAFEMEMCPY( d, s, n ) BlockMoveData((Ptr)(s), (Ptr)(d), (n)) -# else +# else /* nothing left but memcpy() */ # define SAFEMEMCPY( d, s, n ) memcpy((d), (s), (n)) -# endif -# endif # endif #endif diff --git a/include/ac/syslog.h b/include/ac/syslog.h index 8ac3950750..c7afb100ba 100644 --- a/include/ac/syslog.h +++ b/include/ac/syslog.h @@ -5,25 +5,19 @@ #define _AC_SYSLOG_H_ #if defined( HAVE_SYSLOG_H ) -# include -#else -# if defined ( HAVE_SYS_SYSLOG_H ) -# include -# endif +#include +#elif defined ( HAVE_SYS_SYSLOG_H ) +#include #endif #if defined( LOG_NDELAY ) && defined( LOG_NOWAIT ) # define OPENLOG_OPTIONS ( LOG_PID | LOG_NDELAY | LOG_NOWAIT ) -#else -# if defined( LOG_NDELAY ) +#elif defined( LOG_NDELAY ) # define OPENLOG_OPTIONS ( LOG_PID | LOG_NDELAY ) -# else -# if defined( LOG_NOWAIT ) +#elif defined( LOG_NOWAIT ) # define OPENLOG_OPTIONS ( LOG_PID | LOG_NOWAIT ) -# else +#else # define OPENLOG_OPTIONS ( LOG_PID ) -# endif -# endif #endif #endif /* _AC_SYSLOG_H_ */ diff --git a/include/ac/termios.h b/include/ac/termios.h index b5adaa94c7..5590ab0df6 100644 --- a/include/ac/termios.h +++ b/include/ac/termios.h @@ -13,8 +13,7 @@ #define GETFLAGS( tio ) ((tio).c_lflag) #define SETFLAGS( tio, flags ) ((tio).c_lflag = (flags)) -#else /* !HAVE_TERMIOS_H */ -#if defined( HAVE_SGTTY_H ) +#elif defined( HAVE_SGTTY_H ) #include #ifdef HAVE_SYS_IOCTL_H @@ -29,6 +28,5 @@ #define SETFLAGS( tio, flags ) ((tio).sg_flags = (flags)) #endif /* HAVE_SGTTY_H */ -#endif /* HAVE_TERMIOS_H */ #endif /* _AC_TERMIOS_H */ diff --git a/include/ac/time.h b/include/ac/time.h index 0742a5ce60..ba18790a4c 100644 --- a/include/ac/time.h +++ b/include/ac/time.h @@ -6,13 +6,10 @@ #if TIME_WITH_SYS_TIME # include # include +#elif HAVE_SYS_TIME_H +# include #else - /* Do not use #elif, not all non-ANSI compilers support it. */ -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif +# include #endif #endif /* _AC_TIME_H */ diff --git a/include/ac/unistd.h b/include/ac/unistd.h index 1c5a82ba82..a52b288417 100644 --- a/include/ac/unistd.h +++ b/include/ac/unistd.h @@ -22,17 +22,15 @@ #if HAVE_GETOPT_H # include -#else -# if !defined(HAVE_GETOPT) +#elif !defined(HAVE_GETOPT) /* no getopt, assume we need getopt-compat.h */ # include -# else +#else /* assume we need to declare these externs */ extern char *optarg; extern int optind, opterr, optopt; -# endif -#endif /* HAVE_GETOPT_H */ +#endif #ifndef HAVE_TEMPNAM extern char *tempnam(const char *tmpdir, const char *prefix); diff --git a/include/ldbm.h b/include/ldbm.h index 4990371359..0f4c07c3ad 100644 --- a/include/ldbm.h +++ b/include/ldbm.h @@ -57,9 +57,7 @@ typedef DB *LDBM; #define LDBM_REPLACE 0 #define LDBM_SYNC 0x80000000 -/* Do not use #elif. K&R does not support it. */ -#else /* !LDBM_USE_DBBTREE */ -#ifdef LDBM_USE_DBHASH +#elif defined( LDBM_USE_DBHASH ) /***************************************************************** * * @@ -110,8 +108,7 @@ typedef DB *LDBM; #define LDBM_REPLACE 0 #define LDBM_SYNC 0x80000000 -#else /* !LDBM_USE_DBHASH */ -#ifdef HAVE_GDBM +#elif defined( HAVE_GDBM ) /***************************************************************** * * @@ -142,8 +139,7 @@ extern gdbm_error gdbm_errno; #define LDBM_SYNC 0x80000000 -#else /* !HAVE_GDBM */ -#ifdef HAVE_NDBM +#elif defined( HAVE_NDBM ) /***************************************************************** * * @@ -175,10 +171,7 @@ typedef DBM *LDBM; #define LDBM_REPLACE DBM_REPLACE #define LDBM_SYNC 0 -#endif /* HAVE_NDBM */ -#endif /* HAVE_GDBM */ -#endif /* LDBM_USE_DBHASH */ -#endif /* LDBM_USE_DBBTREE */ +#endif int ldbm_errno( LDBM ldbm ); LDBM ldbm_open( char *name, int rw, int mode, int dbcachesize ); diff --git a/include/lthread.h b/include/lthread.h index 123b7efa87..2a23c7791f 100644 --- a/include/lthread.h +++ b/include/lthread.h @@ -5,7 +5,7 @@ #include "portable.h" -#ifdef HAVE_PTHREADS +#if defined( HAVE_PTHREADS ) /********************************** * * * definitions for POSIX Threads * @@ -51,9 +51,7 @@ LDAP_F void pthread_kill LDAP_P(( pthread_t tid, int sig )); LDAP_END_DECL -/* Do not use #elif. K&R does not support it. */ -#else /* !HAVE_PTHREADS */ -#ifdef HAVE_MACH_CTHREADS +#elif defined ( HAVE_MACH_CTHREADS ) /********************************** * * * definitions for Mach CThreads * @@ -93,8 +91,7 @@ typedef struct condition pthread_cond_t; LDAP_END_DECL -#else /* !HAVE_MACH_CTHREADS */ -#ifdef HAVE_THR +#elif defined( HAVE_THR ) /************************************** * * * thread definitions for Solaris LWP * @@ -139,8 +136,7 @@ typedef cond_t pthread_cond_t; LDAP_END_DECL -#else /* !HAVE_THR */ -#ifdef HAVE_LWP +#elif defined( HAVE_LWP ) /************************************* * * * thread definitions for SunOS LWP * @@ -189,7 +185,8 @@ typedef struct lwpcv { LDAP_END_DECL -#else /* !HAVE_LWP */ +#else + /*********************************** * * * thread definitions for no * @@ -239,8 +236,5 @@ typedef int pthread_cond_t; LDAP_END_DECL -#endif /* HAVE_LWP */ -#endif /* HAVE_THR */ -#endif /* HAVE_MACH_CTHREADS */ -#endif /* HAVE_PTHREADS */ +#endif /* no threads support */ #endif /* _LTHREAD_H */