* 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

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 7643a97a1eb8d75fdd4ed500b243ccf70b8f4228..88ec5af8cf3c31741ebac654af40b6dcd4d61038 100644 (file)
--- 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 b23260c871876d79061571c5ebd8e02b6e4c82b2..7034a88bd463994144f22312932a9c28ce04ea4d 100644 (file)
--- 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 1c14444156654fcc3ba0c5584206317690756bd4..88341df7a3b59d779a32c2cc7c9ec84c23e281fa 100644 (file)
--- 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.