Mercurial > pidgin.yaz
diff src/prefix.h @ 10262:7f487c725a90
[gaim-migrate @ 11406]
the autopackage guys were nice enough to quicly fix this for me.
basicly a function was getting #ifdef'd out if you compild with
--disable-binreloc, that shouldn't have been.
committer: Tailor Script <tailor@pidgin.im>
| author | Tim Ringenbach <marv@pidgin.im> |
|---|---|
| date | Thu, 25 Nov 2004 20:48:16 +0000 |
| parents | 645eb9804040 |
| children | ca559e2b1d0a |
line wrap: on
line diff
--- a/src/prefix.h Thu Nov 25 18:35:26 2004 +0000 +++ b/src/prefix.h Thu Nov 25 20:48:16 2004 +0000 @@ -88,13 +88,13 @@ /* The following functions are used internally by BinReloc and shouldn't be used directly in applications. */ -const char *br_thread_local_store (char *str); char *br_locate (void *symbol); char *br_locate_prefix (void *symbol); char *br_prepend_prefix (void *symbol, char *path); +#endif /* ENABLE_BINRELOC */ -#endif /* ENABLE_BINRELOC */ +const char *br_thread_local_store (char *str); /* These macros and functions are not guarded by the ENABLE_BINRELOC @@ -108,6 +108,14 @@ #ifndef BR_NO_MACROS /* Convenience functions for concatenating paths */ + + /* Each time you call one, the previous result will be freed. So don't do this: + * + * some_function( BR_DATADIR("/one"), BR_DATADIR("/two") ) + * + * as the first parameter will now be bogus! + */ + #define BR_SELFPATH(suffix) (br_thread_local_store (br_strcat (SELFPATH, suffix))) #define BR_PREFIX(suffix) (br_thread_local_store (br_strcat (PREFIX, suffix))) #define BR_PREFIXDIR(suffix) (br_thread_local_store (br_strcat (BR_PREFIX, suffix)))