C++ compile fixes

[vlc] / include / vlc_fixups.h

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 2525c866edd6ee16a9c953e8c08b5bc94f50a164..790dc36c612e9135c21fef8ebf4ac9ab30682ce3 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -26,25 +26,26 @@
 #ifndef LIBVLC_FIXUPS_H
 # define LIBVLC_FIXUPS_H 1
 
+#ifndef HAVE_STRDUP
 # include <string.h>
 # include <stdlib.h>
-
-#ifndef HAVE_STRDUP
 static inline char *strdup (const char *str)
 {
     size_t len = strlen (str) + 1;
-    char *res = malloc (len);
+    char *res = (char *)malloc (len);
     if (res) memcpy (res, str, len);
     return res;
 }
 #endif
 
 #ifndef HAVE_VASPRINTF
+# include <stdio.h>
+# include <stdlib.h>
 # include <stdarg.h>
 static inline int vasprintf (char **strp, const char *fmt, va_list ap)
 {
     int len = vsnprintf (NULL, 0, fmt, ap) + 1;
-    char *res = malloc (len);
+    char *res = (char *)malloc (len);
     if (res == NULL)
         return -1;
     *strp = res;
@@ -53,6 +54,7 @@ static inline int vasprintf (char **strp, const char *fmt, va_list ap)
 #endif
 
 #ifndef HAVE_ASPRINTF
+# include <stdio.h>
 # include <stdarg.h>
 static inline int asprintf (char **strp, const char *fmt, ...)
 {
@@ -66,6 +68,7 @@ static inline int asprintf (char **strp, const char *fmt, ...)
 #endif
 
 #ifndef HAVE_STRNLEN
+# include <string.h>
 static inline size_t strnlen (const char *str, size_t max)
 {
     const char *end = (const char *) memchr (str, 0, max);
@@ -74,6 +77,8 @@ static inline size_t strnlen (const char *str, size_t max)
 #endif
 
 #ifndef HAVE_STRNDUP
+# include <string.h>
+# include <stdlib.h>
 static inline char *strndup (const char *str, size_t max)
 {
     size_t len = strnlen (str, max);