diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-12 20:34:06 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-12 20:34:06 +0000 |
| commit | d3ae6e21a12209f5c8cb8c84ba0f68fb69736844 (patch) | |
| tree | 62710b8524ebc7675ebd7f4976fd7f9530ce5df2 /xorg-server/include/os.h | |
| parent | 0be679f7724e33c2761ebb67846707fb3351167b (diff) | |
| parent | 3a20d23b48c1051e1f22295fd886cc7f643417f6 (diff) | |
| download | vcxsrv-d3ae6e21a12209f5c8cb8c84ba0f68fb69736844.tar.gz vcxsrv-d3ae6e21a12209f5c8cb8c84ba0f68fb69736844.tar.bz2 vcxsrv-d3ae6e21a12209f5c8cb8c84ba0f68fb69736844.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/include/os.h')
| -rw-r--r-- | xorg-server/include/os.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index 22b974e19..dd3b05739 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -51,6 +51,7 @@ SOFTWARE. #include "misc.h"
#include <stdarg.h>
+#include <string.h>
#define SCREEN_SAVER_ON 0
#define SCREEN_SAVER_OFF 1
@@ -265,10 +266,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 */);
|