diff options
| author | Greg Hudson <ghudson@mit.edu> | 2014-02-01 15:20:08 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2014-02-26 16:15:19 -0500 |
| commit | 17e205070745e4712d40eed32d92d02edb47009f (patch) | |
| tree | 7b84dc2f536d8c73da8155a186fbbc23c3b88dc1 /src/lib | |
| parent | 4c376a3776aed0fb19b761406eaa2e0516ff6735 (diff) | |
| download | krb5-17e205070745e4712d40eed32d92d02edb47009f.tar.gz krb5-17e205070745e4712d40eed32d92d02edb47009f.tar.xz krb5-17e205070745e4712d40eed32d92d02edb47009f.zip | |
Assume <stdint.h> and fixed-width types
Make unconditional use of <stdint.h> and fixed-width types such as
uint32_t. k5-plugin.h doesn't use any special integer types, so
remove the conditional include block there. Nothing uses
INT64_FMT/UINT64_FMT, so leave those out of k5-platform.h for now.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/gssapi/generic/Makefile.in | 6 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/Makefile.in | 16 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/gssapi_krb5.hin | 10 |
3 files changed, 4 insertions, 28 deletions
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index 40c6772856..c34cba4593 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -42,18 +42,12 @@ gssapi_err_generic.h: gssapi_err_generic.et gssapi_err_generic.c: gssapi_err_generic.et ##DOS##!if 0 -include_stdint=@include_stdint@ -include_inttypes=@include_inttypes@ include_xom=@include_xom@ -##DOS##include_stdint=rem -##DOS##include_inttypes=rem ##DOS##include_xom=rem gssapi.h: gssapi.hin @echo "Creating gssapi.h" ; \ h=gss$$$$; $(RM) $$h; \ (echo "/* This is the gssapi.h prologue. */"; \ - $(include_stdint) && \ - $(include_inttypes) && \ $(include_xom) && \ echo "/* End of gssapi.h prologue. */"&& \ cat $(srcdir)/gssapi.hin )> $$h && \ diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in index 1e77ea85c6..342747868c 100644 --- a/src/lib/gssapi/krb5/Makefile.in +++ b/src/lib/gssapi/krb5/Makefile.in @@ -247,20 +247,8 @@ clean-windows:: generate-files-mac: gssapi_krb5.h error_map.h -##DOS##!if 0 -gssapi_krb5.h: gssapi_krb5.hin - @echo "Creating gssapi.h" ; \ - h=gss$$$$; $(RM) $$h; \ - (echo "/* This is the gssapi_krb5.h prologue. */"; \ - $(include_stdint) ; \ - echo "/* End of gssapi_krb5.h prologue. */"; \ - cat $(srcdir)/gssapi_krb5.hin )> $$h && \ - (set -x; $(MV) $$h $@) ; e=$$?; $(RM) $$h; exit $$e -##DOS##!endif -##DOS### No prologue needed for Windows, the support is -##DOS### in gssapi_krb5.hin already. -##DOS##gssapi_krb5.h: gssapi_krb5.hin -##DOS## $(CP) gssapi_krb5.hin gssapi_krb5.h +gssapi_krb5.h: $(srcdir)/gssapi_krb5.hin + $(CP) $(srcdir)/gssapi_krb5.hin $@ install-headers-unix install:: @set -x; for f in $(EXPORTED_HEADERS) ; \ diff --git a/src/lib/gssapi/krb5/gssapi_krb5.hin b/src/lib/gssapi/krb5/gssapi_krb5.hin index 9d124fa091..1271f27bb4 100644 --- a/src/lib/gssapi/krb5/gssapi_krb5.hin +++ b/src/lib/gssapi/krb5/gssapi_krb5.hin @@ -27,6 +27,7 @@ #include <gssapi/gssapi.h> #include <gssapi/gssapi_ext.h> #include <krb5.h> +#include <stdint.h> /* C++ friendlyness */ #ifdef __cplusplus @@ -92,14 +93,7 @@ GSS_DLLIMP extern const gss_OID_desc krb5_gss_oid_array[]; #define gss_krb5_nt_machine_uid_name gss_nt_machine_uid_name #define gss_krb5_nt_string_uid_name gss_nt_string_uid_name - -#if defined(_WIN32) -typedef unsigned __int64 gss_uint64; -#else /*windows*/ -#include <inttypes.h> -typedef uint64_t gss_uint64; -#endif - +typedef uint64_t gss_uint64; typedef struct gss_krb5_lucid_key { OM_uint32 type; /* key encryption type */ |