diff options
| author | Tom Yu <tlyu@mit.edu> | 2003-05-22 22:25:03 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2003-05-22 22:25:03 +0000 |
| commit | c138a6784e6d32ef5c1e75e1486dbf860bf5ad80 (patch) | |
| tree | 71294abe218d0f0b04a08046f3f6d21f4dd96f4b /src/include | |
| parent | 0ff486ed0c17e938e5fe1e8b02906a5039d7dee8 (diff) | |
| download | krb5-c138a6784e6d32ef5c1e75e1486dbf860bf5ad80.tar.gz krb5-c138a6784e6d32ef5c1e75e1486dbf860bf5ad80.tar.xz krb5-c138a6784e6d32ef5c1e75e1486dbf860bf5ad80.zip | |
Default KRB5_DEPRECATED to 0, but force it to 1 for in-tree stuff
ticket: 1483
tags: pullup
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15469 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/krb5.hin | 21 |
2 files changed, 11 insertions, 15 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 55ec2fee86..552d4c34d2 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,8 @@ +2003-05-22 Tom Yu <tlyu@mit.edu> + + * krb5.hin: Default KRB5_DEPRECATED to 0. Default KRB5_PRIVATE to + 0 on all platforms. + 2003-05-22 Sam Hartman <hartmans@mit.edu> * k5-int.h: krb5int_populate_gic_opt returns void diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 0bf822e4ab..9c7123e779 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -56,8 +56,13 @@ #ifndef KRB5_GENERAL__ #define KRB5_GENERAL__ +/* By default, do not expose deprecated interfaces. */ #ifndef KRB5_DEPRECATED -#define KRB5_DEPRECATED 1 /* Expose deprecated things for now. */ +#define KRB5_DEPRECATED 0 +#endif +/* Do not expose private interfaces. Build system will override. */ +#ifndef KRB5_PRIVATE +#define KRB5_PRIVATE 0 #endif #if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__)) @@ -65,20 +70,6 @@ # if TARGET_RT_MAC_CFM # error "Use KfM 4.0 SDK headers for CFM compilation." # endif - -# ifndef KRB5_PRIVATE /* Allow e.g. build system to override */ -# define KRB5_PRIVATE 0 -# endif -#else -#if defined(_WIN32) -# ifndef KRB5_PRIVATE -# define KRB5_PRIVATE 0 -# endif -#else -# ifndef KRB5_PRIVATE -# define KRB5_PRIVATE 1 -# endif -#endif #endif #if defined(_MSDOS) || defined(_WIN32) |