diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-10-21 00:52:14 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-10-21 00:52:14 +0000 |
| commit | a71c83bc448a0bf63ca753840f78f1c5b36bcdff (patch) | |
| tree | 59c35f05e30477dc9ba419c2be77fbbd273a6bd5 | |
| parent | 7bda1856da37818bcc746ba00e6737dc8490ea73 (diff) | |
| download | uClibc-alpine-a71c83bc448a0bf63ca753840f78f1c5b36bcdff.tar.bz2 uClibc-alpine-a71c83bc448a0bf63ca753840f78f1c5b36bcdff.tar.xz | |
Doh! In include/bits/uClibc_config.h when we define things, we appropriately
prepend "__". Unfortunately, when we #undef things, we do not prepend the
"__". This results in collateral damage to unsuspecting applications as we
undefine random unrelated macros. Oops.
For example, when compiling xfree86, libGLcore.a defines MALLOC for its own usage.
But include/bits/uClibc_config.h then does an
#undef MALLOC
#define __MALLOC_930716__ 1
which inadvertantly trashes the define from libGLcore.... Ouch.
The autogenerated include/bits/uClibc_config.h should instead have
contained:
#undef __MALLOC__
#define __MALLOC_930716__ 1
This patch makes that happen.
| -rw-r--r-- | extra/config/confdata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/config/confdata.c b/extra/config/confdata.c index 694477fb6..114c76382 100644 --- a/extra/config/confdata.c +++ b/extra/config/confdata.c @@ -347,7 +347,7 @@ int conf_write(const char *name) case no: fprintf(out, "# %s is not set\n", sym->name); if (out_h) - fprintf(out_h, "#undef %s\n", sym->name); + fprintf(out_h, "#undef __%s__\n", sym->name); break; case mod: fprintf(out, "%s=m\n", sym->name); |