diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2005-02-09 00:14:57 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2005-02-09 00:14:57 +0000 |
| commit | 6a085e24743a1541aab48313f28539353c19cbc3 (patch) | |
| tree | 331ede92998cdfa482720d333bf840610432de9a /src/include | |
| parent | 78de391d385a134571247f17061b95290c819f9e (diff) | |
| download | krb5-6a085e24743a1541aab48313f28539353c19cbc3.tar.gz krb5-6a085e24743a1541aab48313f28539353c19cbc3.tar.xz krb5-6a085e24743a1541aab48313f28539353c19cbc3.zip | |
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
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/k5-platform.h | 2 |
2 files changed, 7 insertions, 0 deletions
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 <raeburn@mit.edu> + + * k5-platform.h (PROGRAM_EXITING) [__GNUC__ && !_WIN32 && + CONSTRUCTOR_ATTR_WORKS]: Define as zero. + 2005-02-02 Ken Raeburn <raeburn@mit.edu> * 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 |