X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=snprintf%2Fwcio.h;h=ddaf9e4b2f415ecc2921e3e3300ff3ed0ec48a92;hb=de713d8a77cbd77e60f58537b0fc222f98fde395;hp=1b41ec971d2f2fe9fb58de5f2b894993ed60ac7b;hpb=bf0d695d692163edb23b8fbbbd976387dfef232d;p=lttng-ust.git

diff --git a/snprintf/wcio.h b/snprintf/wcio.h
index 1b41ec97..ddaf9e4b 100644
--- a/snprintf/wcio.h
+++ b/snprintf/wcio.h
@@ -32,6 +32,9 @@
 #ifndef _WCIO_H_
 #define _WCIO_H_
 
+#include <stddef.h>
+#include <wchar.h>
+
 /* minimal requirement of SUSv2 */
 #define WCIO_UNGETWC_BUFSIZE 1
 
@@ -48,6 +51,9 @@ struct wchar_io_data {
 #define WCIO_GET(fp) \
 	(_EXT(fp) ? &(_EXT(fp)->_wcio) : (struct wchar_io_data *)0)
 
+#define WCIO_GET_NONULL(fp) \
+	(&(_EXT(fp)->_wcio))
+
 #define _SET_ORIENTATION(fp, mode) \
 do {\
 	struct wchar_io_data *_wcio = WCIO_GET(fp); \
@@ -76,6 +82,6 @@ do {\
 } while (0)
 
 #define WCIO_INIT(fp) \
-	memset(WCIO_GET(fp), 0, sizeof(struct wchar_io_data))
+	memset(WCIO_GET_NONULL(fp), 0, sizeof(struct wchar_io_data))
 
 #endif /*_WCIO_H_*/