summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/ChangeLog5
-rw-r--r--src/include/krb5.hin7
2 files changed, 11 insertions, 1 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 3d51a9e17..57669784f 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 29 22:54:30 1995 Tom Yu (tlyu@dragons-lair)
+
+ * krb5.hin: special-case ultrix brokenness (again!) for
+ KRB5_CONST; krb5.h breaks when typedef'ing while
+ installed. Yuck.
Tue Jun 27 16:14:38 EDT 1995 Paul Park (pjpark@mit.edu)
* krb5.hin - Reinstate KRB5_PROVIDE_PROTOTYPES. This is needed for
diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 6bd36e366..45ee5f616 100644
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -153,7 +153,12 @@ typedef struct _krb5_data {
} krb5_data;
/* Define krb5_const as necessary */
-#ifdef KRB5_NO_CONST
+
+/*
+ * Hardcoded scrudge to deal with Ultrix; see note on NPROTOTYPE below
+ */
+
+#if defined(KRB5_NO_CONST) || (defined(__ultrix) && !defined(__GNUC__))
#define krb5_const
#else
#define krb5_const const