summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2014-02-26 17:39:55 -0500
committerGreg Hudson <ghudson@mit.edu>2014-02-26 18:05:23 -0500
commit654ea67e99ea91e39896d55c0e6dd3bfc8ee049a (patch)
tree2eab6ec3c16e67dcef77f78b0e93ea7243e370ad
parenta2ac57b0ec230efed06fabc2d55db1fcbc6f7ea3 (diff)
downloadkrb5-654ea67e99ea91e39896d55c0e6dd3bfc8ee049a.tar.gz
krb5-654ea67e99ea91e39896d55c0e6dd3bfc8ee049a.tar.xz
krb5-654ea67e99ea91e39896d55c0e6dd3bfc8ee049a.zip
Fix two omissions in stdint.h changes
Since we no longer prefix an "#include <stdint.h>" in the gssapi.h preamble at build time, include it in gssapi.hin. Update util/gss/kernel-lib/Makefile.in to account for gssapi_krb5.h being in the source tree.
-rw-r--r--src/lib/gssapi/generic/gssapi.hin2
-rw-r--r--src/util/gss-kernel-lib/Makefile.in6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index 54433f7035..f67e75c1d4 100644
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -52,6 +52,8 @@ extern "C" {
#define KRB5_CALLCONV_C
#endif
+#include <stdint.h>
+
/*
* First, include stddef.h to get size_t defined.
*/
diff --git a/src/util/gss-kernel-lib/Makefile.in b/src/util/gss-kernel-lib/Makefile.in
index c502494a96..dc017d3700 100644
--- a/src/util/gss-kernel-lib/Makefile.in
+++ b/src/util/gss-kernel-lib/Makefile.in
@@ -146,8 +146,8 @@ gssapi.h: $(INCLUDE)/gssapi.h
$(CP) $(INCLUDE)/gssapi.h $@
gssapi/gssapi.h: gssapi $(GSS_GENERIC_BUILD)/gssapi.h
$(CP) $(GSS_GENERIC_BUILD)/gssapi.h $@
-gssapi/gssapi_krb5.h: gssapi $(GSS_KRB5_BUILD)/gssapi_krb5.h
- $(CP) $(GSS_KRB5_BUILD)/gssapi_krb5.h $@
+gssapi/gssapi_krb5.h: gssapi $(GSS_KRB5)/gssapi_krb5.h
+ $(CP) $(GSS_KRB5)/gssapi_krb5.h $@
gssapi/gssapi_alloc.h: gssapi $(GSS_GENERIC)/gssapi_alloc.h
$(CP) $(GSS_GENERIC)/gssapi_alloc.h $@
gssapi/gssapi_ext.h: gssapi $(GSS_GENERIC)/gssapi_ext.h
@@ -209,8 +209,6 @@ $(GSS_GENERIC_BUILD)/gssapi.h:
(cd $(GSS_GENERIC_BUILD) && $(MAKE) gssapi.h)
$(GSS_GENERIC_BUILD)/gssapi_err_generic.h:
(cd $(GSS_GENERIC_BUILD) && $(MAKE) gssapi_err_generic.h)
-$(GSS_KRB5_BUILD)/gssapi_krb5.h:
- (cd $(GSS_KRB5_BUILD) && $(MAKE) gssapi_krb5.h)
$(GSS_KRB5_BUILD)/gssapi_err_krb5.h:
(cd $(GSS_KRB5_BUILD) && $(MAKE) gssapi_err_krb5.h)
$(INCLUDE_BUILD)/osconf.h: