diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-10 12:17:39 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-10 12:17:39 +0100 |
| commit | e54e42af93017ba6ab5f18a83e705a8e24ed3906 (patch) | |
| tree | f8e2d29d74d45e5cc2bad958d223feb45d16f292 /nx-X11/programs/Xserver/include/os.h | |
| parent | 804ff44523ab726fdb59b80193652465df0482ee (diff) | |
| parent | a6e632aac9a013fbae6e8b6a17688e8b1a81e12d (diff) | |
| download | nx-libs-e54e42af93017ba6ab5f18a83e705a8e24ed3906.tar.gz nx-libs-e54e42af93017ba6ab5f18a83e705a8e24ed3906.tar.bz2 nx-libs-e54e42af93017ba6ab5f18a83e705a8e24ed3906.zip | |
Merge branch 'Ionic-feature/backport-asprintf' into 3.6.x
Attributes GH PR #592: https://github.com/ArcticaProject/nx-libs/pull/592
Diffstat (limited to 'nx-X11/programs/Xserver/include/os.h')
| -rw-r--r-- | nx-X11/programs/Xserver/include/os.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h index 0c7ce6a6f..be41e0118 100644 --- a/nx-X11/programs/Xserver/include/os.h +++ b/nx-X11/programs/Xserver/include/os.h @@ -230,10 +230,15 @@ extern void OsInitAllocator(void); extern char *Xstrdup(const char *s); extern char *XNFstrdup(const char *s); -extern char *Xprintf(const char *fmt, ...); -extern char *Xvprintf(const char *fmt, va_list va); -extern char *XNFprintf(const char *fmt, ...); -extern 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 SIGVAL (*OsSigHandlerPtr)(int /* sig */); |