macosx: Fix #1802 Cursor not hidden if fullscreen controller is disabled (OS X).

[vlc] / include / vlc_fixups.h

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 2525c866edd6ee16a9c953e8c08b5bc94f50a164..df250fc81876a12b51f7a4e163606d48b00277ba 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);
@@ -141,7 +146,7 @@ static inline int strcasecmp (const char *s1, const char *s2)
     for (size_t i = 0;; i++)
     {
         int d = tolower (s1[i]) - tolower (s2[i]);
-        if (d) return d;
+        if (d || !s1[i]) return d;
     }
     return 0;
 }
@@ -158,7 +163,7 @@ static inline int strncasecmp (const char *s1, const char *s2, size_t n)
     for (size_t i = 0; i < n; i++)
     {
         int d = tolower (s1[i]) - tolower (s2[i]);
-        if (d) return d;
+        if (d || !s1[i]) return d;
     }
     return 0;
 }
@@ -199,6 +204,13 @@ static inline struct tm *gmtime_r (const time_t *timep, struct tm *result)
 }
 #endif
 
+/* Alignment of critical static data structures */
+#ifdef ATTRIBUTE_ALIGNED_MAX
+#   define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align)))
+#else
+#   define ATTR_ALIGN(align)
+#endif
+
 #ifndef HAVE_USELOCALE
 typedef void *locale_t;
 # define newlocale( a, b, c ) ((locale_t)0)
@@ -218,8 +230,6 @@ typedef void *locale_t;
 
 #if defined (ENABLE_NLS)
 # include <libintl.h>
-#else
-# define dgettext(dom, str) ((char *)(str))
 #endif
 
 #define N_(str) gettext_noop (str)