diff options
| author | Keith Packard <keithp@keithp.com> | 2010-12-07 13:39:58 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-12-07 13:39:58 -0800 |
| commit | 519d243f0c8e3c80226701f71d2cfa62e42dbff7 (patch) | |
| tree | 6b383bf1838a86b277a13fb337fbf55247ef6c70 /include/os.h | |
| parent | 9f9c732311ef0cc198e5ec44d02412eb7e8c3f3a (diff) | |
| parent | 446482efaa3d266266e2a143492a3ec0523622bd (diff) | |
Merge remote branch 'alanc/master'
Diffstat (limited to 'include/os.h')
| -rw-r--r-- | include/os.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/os.h b/include/os.h index d587f3441..d747040ca 100644 --- a/include/os.h +++ b/include/os.h @@ -264,10 +264,14 @@ extern _X_EXPORT char *Xstrdup(const char *s); */ extern _X_EXPORT char *XNFstrdup(const char *s); -extern _X_EXPORT char *Xprintf(const char *fmt, ...) _X_ATTRIBUTE_PRINTF(1,2); -extern _X_EXPORT char *Xvprintf(const char *fmt, va_list va); -extern _X_EXPORT char *XNFprintf(const char *fmt, ...) _X_ATTRIBUTE_PRINTF(1,2); -extern _X_EXPORT char *XNFvprintf(const char *fmt, va_list va); +/* Include new X*asprintf API */ +#include "Xprintf.h" + +/* Older api deprecated in favor of the asprintf versions */ +extern _X_EXPORT char *Xprintf(const char *fmt, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_DEPRECATED; +extern _X_EXPORT char *Xvprintf(const char *fmt, va_list va)_X_ATTRIBUTE_PRINTF(1,0) _X_DEPRECATED; +extern _X_EXPORT char *XNFprintf(const char *fmt, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_DEPRECATED; +extern _X_EXPORT char *XNFvprintf(const char *fmt, va_list va)_X_ATTRIBUTE_PRINTF(1,0) _X_DEPRECATED; typedef void (*OsSigHandlerPtr)(int /* sig */); typedef int (*OsSigWrapperPtr)(int /* sig */); |