diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2005-02-03 00:27:33 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2005-02-03 00:27:33 +0000 |
| commit | 2a8421960e49a9ec621d39c46132dfd429ea9843 (patch) | |
| tree | baefb2403926d33f35c0a62ec17fc206744364c2 | |
| parent | ea268a4a60a16b8f9ccf0de345c9507e54c999e5 (diff) | |
| download | krb5-2a8421960e49a9ec621d39c46132dfd429ea9843.tar.gz krb5-2a8421960e49a9ec621d39c46132dfd429ea9843.tar.xz krb5-2a8421960e49a9ec621d39c46132dfd429ea9843.zip | |
* Makefile.in (gssapi.h): Change SIZEOF symbols to start with GSS_ when
extracting from autoconf.h. Don't look for HAVE_ or USE_ symbols. Add
${include_xom} to the prologue.
(include_xom): New variable.
* gssapi.h: Always include stddef.h unconditionally.
(GSS_SIZEOF_INT, GSS_SIZEOF_LONG, GSS_SIZEOF_SHORT): Don't define.
ticket: 2910
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17077 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/gssapi/generic/ChangeLog | 10 | ||||
| -rw-r--r-- | src/lib/gssapi/generic/Makefile.in | 7 | ||||
| -rw-r--r-- | src/lib/gssapi/generic/gssapi.hin | 6 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 7643a97a1e..88ec5af8cf 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,13 @@ +2005-02-02 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (gssapi.h): Change SIZEOF symbols to start with GSS_ + when extracting from autoconf.h. Don't look for HAVE_ or USE_ + symbols. Add ${include_xom} to the prologue. + (include_xom): New variable. + * gssapi.h: Always include stddef.h unconditionally. + (GSS_SIZEOF_INT, GSS_SIZEOF_LONG, GSS_SIZEOF_SHORT): Don't + define. + 2004-06-22 Ken Raeburn <raeburn@mit.edu> * gssapi.hin: Don't test macintosh or __MWERKS__. diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index b23260c871..7034a88bd4 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -37,14 +37,15 @@ $(OUTPRE)gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c gssapi_err_generic.h: gssapi_err_generic.et gssapi_err_generic.c: gssapi_err_generic.et +include_xom=@include_xom@ +##DOS##include_xom= gssapi.h: gssapi.hin @echo "Creating gssapi.h" ; \ h=gss$$$$; $(RM) $$h; \ (echo "/* This is the gssapi.h prologue. */"; \ echo "/* It contains some choice pieces of autoconf.h */"; \ - grep SIZEOF $(BUILDTOP)/include/krb5/autoconf.h; \ - grep 'HAVE_.*_H' $(BUILDTOP)/include/krb5/autoconf.h; \ - grep 'USE_.*_H' $(BUILDTOP)/include/krb5/autoconf.h; \ + sed -n "/SIZEOF/s//GSS_&/p" < $(BUILDTOP)/include/krb5/autoconf.h; \ + echo "${include_xom}"; \ echo "/* End of gssapi.h prologue. */"; \ cat $(srcdir)/gssapi.hin )> $$h && \ (set -x; $(MV) $$h $@) ; e=$$?; $(RM) $$h; exit $$e diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin index 1c14444156..88341df7a3 100644 --- a/src/lib/gssapi/generic/gssapi.hin +++ b/src/lib/gssapi/generic/gssapi.hin @@ -51,16 +51,10 @@ extern "C" { #define KRB5_CALLCONV_C #endif -#define GSS_SIZEOF_INT SIZEOF_INT -#define GSS_SIZEOF_LONG SIZEOF_LONG -#define GSS_SIZEOF_SHORT SIZEOF_SHORT - /* * First, include stddef.h to get size_t defined. */ -#if HAVE_STDDEF_H #include <stddef.h> -#endif /* HAVE_STDDEF_H */ /* * POSIX says that sys/types.h is where size_t is defined. |