summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorJohn Carr <jfc@mit.edu>1992-02-23 12:08:44 +0000
committerJohn Carr <jfc@mit.edu>1992-02-23 12:08:44 +0000
commita6e4a4170c64160f66c89b328a424dd2e9999eae (patch)
treed935c909b91c6561c612963e8ac957f3248b9b38 /src/include
parent5c14d66bc6b83e2e44d571a3774bd62e021a794d (diff)
downloadkrb5-a6e4a4170c64160f66c89b328a424dd2e9999eae.tar.gz
krb5-a6e4a4170c64160f66c89b328a424dd2e9999eae.tar.xz
krb5-a6e4a4170c64160f66c89b328a424dd2e9999eae.zip
Make use of "const" and "volatile" configurable
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@2216 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
-rw-r--r--src/include/krb5/base-defs.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h
index ce2897417..a1f8f3e55 100644
--- a/src/include/krb5/base-defs.h
+++ b/src/include/krb5/base-defs.h
@@ -59,17 +59,22 @@ typedef struct _krb5_data {
char *data;
} krb5_data;
+/* make const & volatile available without effect */
+
+#if !defined(__STDC__) && !defined(HAS_ANSI_CONST)
+#define const
+#endif
+#if !defined(__STDC__) && !defined(HAS_ANSI_VOLATILE)
+#define volatile
+#endif
-#ifdef __STDC__
+#if defined(__STDC__) || defined(HAS_VOID_TYPE)
typedef void * krb5_pointer;
typedef void const * krb5_const_pointer;
#else
-/* make const & volatile available without effect */
-#define const
-#define volatile
typedef char * krb5_pointer;
-typedef char * krb5_const_pointer;
-#endif /* __STDC__ */
+typedef char const * krb5_const_pointer;
+#endif
#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
#define PROTOTYPE(x) x