From: Ken Raeburn Date: Wed, 9 Feb 2005 00:14:57 +0000 (+0000) Subject: Fix build problem found testing certain combinations of options X-Git-Tag: ms-bug-test-20060525~346 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a085e24743a1541aab48313f28539353c19cbc3;p=krb5.git Fix build problem found testing certain combinations of options * k5-platform.h (PROGRAM_EXITING) [__GNUC__ && !_WIN32 && CONSTRUCTOR_ATTR_WORKS && !DELAY_INITIALIZER]: Define as zero. ticket: 2916 status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17089 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/include/ChangeLog b/src/include/ChangeLog index d6587b559..d4c0cded0 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,8 @@ +2005-02-08 Ken Raeburn + + * k5-platform.h (PROGRAM_EXITING) [__GNUC__ && !_WIN32 && + CONSTRUCTOR_ATTR_WORKS]: Define as zero. + 2005-02-02 Ken Raeburn * configure.in: Put #ifndef/#define/#endif wrapper into diff --git a/src/include/k5-platform.h b/src/include/k5-platform.h index e0793f629..5c634bfc4 100644 --- a/src/include/k5-platform.h +++ b/src/include/k5-platform.h @@ -232,6 +232,8 @@ typedef struct { int error; unsigned char did_run; } k5_init_t; : (abort(),0)) # define INITIALIZER_RAN(NAME) (JOIN__2(NAME,ran).did_run == 3 && JOIN__2(NAME, ran).error == 0) +# define PROGRAM_EXITING() (0) + #elif defined(USE_LINKER_INIT_OPTION) || defined(_WIN32) /* Run initializer at load time, via linker magic, or in the