diff options
| author | Tom Yu <tlyu@mit.edu> | 1995-06-23 19:43:08 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1995-06-23 19:43:08 +0000 |
| commit | 8e251b33d0b4a4a3cd7904e13f6b446a0a026e66 (patch) | |
| tree | 16443711a9dc97eb12ffb166090802a062b0288c /src | |
| parent | d5ad8f490c56c1f1ba4e30d253cb87b9f0e45151 (diff) | |
| download | krb5-8e251b33d0b4a4a3cd7904e13f6b446a0a026e66.tar.gz krb5-8e251b33d0b4a4a3cd7904e13f6b446a0a026e66.tar.xz krb5-8e251b33d0b4a4a3cd7904e13f6b446a0a026e66.zip | |
* syslog.h: reverse sense of KRB5_PROVIDE_PROTOTYPES
* krb5.hin: special-case ultrix brokenness, reverse sense of
KRB5_PROVIDE_PROTOTYPES (becomes KRB5_NO_PROTOTYPES);
also, NO_NESTED_PROTOTYPES -> KRB5_NO_NESTED_PROTOTYPES
* Makefile.in: don't install NO_NESTED_PROTOTYPES, HAS_VOID_TYPE,
and KRB5_PROVIDE_PROTOTYPES symbols into krb5.h
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6151 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ChangeLog | 8 | ||||
| -rw-r--r-- | src/include/Makefile.in | 2 | ||||
| -rw-r--r-- | src/include/krb5.hin | 10 | ||||
| -rw-r--r-- | src/include/syslog.h | 2 |
4 files changed, 17 insertions, 5 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 05186cb752..6fd59a2e0e 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,11 @@ +Thu Jun 22 16:03:07 1995 Tom Yu (tlyu@dragons-lair) + + * syslog.h: reverse sense of KRB5_PROVIDE_PROTOTYPES + * krb5.hin: special-case ultrix brokenness, reverse sense of + KRB5_PROVIDE_PROTOTYPES (becomes KRB5_NO_PROTOTYPES); + also, NO_NESTED_PROTOTYPES -> KRB5_NO_NESTED_PROTOTYPES + * Makefile.in: don't install NO_NESTED_PROTOTYPES, HAS_VOID_TYPE, + and KRB5_PROVIDE_PROTOTYPES symbols into krb5.h Thu Jun 22 11:51:10 EDT 1995 Paul Park (pjpark@mit.edu) * k5-int.h - Add pointer in krb5_context for database context. diff --git a/src/include/Makefile.in b/src/include/Makefile.in index 1fa2b4cf02..fd42525158 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -21,8 +21,6 @@ krb5-pro.h: krb5/autoconf.h echo "/* This is the prologue to krb5.h */" > krb5-pro.h echo "/* Unfortunately some of these defines are compiler dependent */" >> krb5-pro.h grep SIZEOF krb5/autoconf.h >> krb5-pro.h - grep PROTOTYPES krb5/autoconf.h >> krb5-pro.h - grep HAS_VOID_TYPE krb5/autoconf.h >> krb5-pro.h grep HAVE_STDARG_H krb5/autoconf.h >> krb5-pro.h echo "/* End of prologue section */" >> krb5-pro.h diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 22e3c814ed..542efe12c7 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -167,7 +167,7 @@ typedef char FAR * krb5_pointer; typedef char krb5_const FAR * krb5_const_pointer; #endif -#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS) +#if (defined(__STDC__) || defined(_WINDOWS)) && !defined(KRB5_NO_PROTOTYPES) #define KRB5_PROTOTYPE(x) x #if defined(__STDC__) || defined(HAVE_STDARG_H) || defined(_WINDOWS) #define KRB5_STDARG_P(x) x @@ -179,7 +179,13 @@ typedef char krb5_const FAR * krb5_const_pointer; #define KRB5_STDARG_P(x) () #endif /* STDC or PROTOTYPES */ -#ifdef NO_NESTED_PROTOTYPES +/* + * This gross compiler dependency is in here because the stock Ultrix + * compiler defines __STDC__ but doesn't deal with nested prototypes + * properly. The reason this isn't tested for is so that this header + * is actually useful when installed. + */ +#if defined(KRB5_NO_NESTED_PROTOTYPES) || (defined(__ultrix) && !defined(__GNUC__)) #define KRB5_NPROTOTYPE(x) () #else #define KRB5_NPROTOTYPE(x) KRB5_PROTOTYPE(x) diff --git a/src/include/syslog.h b/src/include/syslog.h index 567fc74f3e..58bef0dd64 100644 --- a/src/include/syslog.h +++ b/src/include/syslog.h @@ -90,7 +90,7 @@ #define LOG_NOWAIT 0x10 /* if forking to log on console, don't wait() */ #ifndef KERNEL -#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS) +#if (defined(__STDC__) || defined(_WINDOWS)) && !defined(KRB5_NO_PROTOTYPES) extern void syslog (int , const char *, ... ); #ifdef va_start /* XXX depending on #define of va_start in <stdarg.h> */ |