Add a mailmap

[vlc] / include / vlc_common.h

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 1da9ea950f4e865fea7bca65ecfb082bced5dcac..8e03ed36e31a366d2b924b7e29e94f7f1453fab1 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -76,8 +76,6 @@
  #define PRIo64 "llo"
  #undef PRIx64
  #define PRIx64 "llx"
- #define snprintf        __mingw_snprintf
- #define vsnprintf       __mingw_vsnprintf
 #endif
 
 /* Function attributes for compiler warnings */
@@ -398,12 +396,12 @@ typedef struct meta_engine_t meta_engine_t;
 
 /* stat/lstat/fstat */
 #ifdef WIN32
-#include <sys/stat.h>
+# include <sys/stat.h>
 
 # ifndef UNDER_CE
 struct _stati64;
-#define stat _stati64
-#define fstat _fstati64
+#  define stat _stati64
+#  define fstat _fstati64
 #endif
 
 /* You should otherwise use vlc_stat and vlc_lstat. */
@@ -472,8 +470,10 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
  * OS-specific headers and thread types
  *****************************************************************************/
 #if defined( WIN32 ) || defined( UNDER_CE )
-#   define WIN32_LEAN_AND_MEAN
-#   include <windows.h>
+/* WIN32_LEAN_AND_MEAN is needed to be able to include winsock2.h because else,
+ * windows.h will also include winsock.h and declarations will conflict */
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
 #endif
 
 #include "vlc_mtime.h"
@@ -694,7 +694,7 @@ VLC_API char const * vlc_error( int ) VLC_USED;
 #ifdef WORDS_BIGENDIAN
 # define hton16(i) ((uint16_t)(i))
 # define hton32(i) ((uint32_t)(i))
-# define hton64(i) ((uint32_t)(i))
+# define hton64(i) ((uint64_t)(i))
 #else
 # define hton16(i) bswap16(i)
 # define hton32(i) bswap32(i)
@@ -778,28 +778,28 @@ static inline uint64_t GetQWLE (const void *p)
 }
 
 /** Writes 16 bits in network byte order */
-static inline void SetWLE (void *p, uint16_t w)
+static inline void SetWBE (void *p, uint16_t w)
 {
     w = hton16 (w);
     memcpy (p, &w, sizeof (w));
 }
 
 /** Writes 32 bits in network byte order */
-static inline void SetDWLE (void *p, uint32_t dw)
+static inline void SetDWBE (void *p, uint32_t dw)
 {
     dw = hton32 (dw);
     memcpy (p, &dw, sizeof (dw));
 }
 
 /** Writes 64 bits in network byte order */
-static inline void SetQWLE (void *p, uint64_t qw)
+static inline void SetQWBE (void *p, uint64_t qw)
 {
     qw = hton64 (qw);
     memcpy (p, &qw, sizeof (qw));
 }
 
 /** Writes 16 bits in little endian order */
-static inline void SetWBE (void *p, uint16_t w)
+static inline void SetWLE (void *p, uint16_t w)
 {
 #ifdef WORDS_BIGENDIAN
     w = bswap16 (w);
@@ -808,7 +808,7 @@ static inline void SetWBE (void *p, uint16_t w)
 }
 
 /** Writes 32 bits in little endian order */
-static inline void SetDWBE (void *p, uint32_t dw)
+static inline void SetDWLE (void *p, uint32_t dw)
 {
 #ifdef WORDS_BIGENDIAN
     dw = bswap32 (dw);
@@ -817,10 +817,10 @@ static inline void SetDWBE (void *p, uint32_t dw)
 }
 
 /** Writes 64 bits in little endian order */
-static inline void SetQWBE (void *p, uint64_t qw)
+static inline void SetQWLE (void *p, uint64_t qw)
 {
 #ifdef WORDS_BIGENDIAN
-    qw = bswap32 (qw);
+    qw = bswap64 (qw);
 #endif
     memcpy (p, &qw, sizeof (qw));
 }
@@ -855,7 +855,7 @@ static inline void SetQWBE (void *p, uint64_t qw)
 #       endif
 #   endif
 
-#   if defined( _MSC_VER ) && !defined( __WXMSW__ )
+#   if defined( _MSC_VER )
 #       if !defined( _OFF_T_DEFINED )
             typedef __int64 off_t;
 #           define _OFF_T_DEFINED
@@ -883,7 +883,48 @@ static inline void SetQWBE (void *p, uint64_t qw)
 
 VLC_API bool vlc_ureduce( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t );
 
-VLC_API void * vlc_memalign( void **base, size_t alignment, size_t size ) VLC_USED;
+/* Aligned memory allocator */
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+#endif
+
+#ifdef WIN32
+# include <malloc.h>
+# define vlc_memalign(align, size) (__mingw_aligned_malloc(size, align))
+# define vlc_free(base)            (__mingw_aligned_free(base))
+#elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
+static inline void *vlc_memalign(size_t align, size_t size)
+{
+    long diff;
+    void *ptr;
+
+    ptr = malloc(size+align);
+    if(!ptr)
+        return ptr;
+    diff = ((-(long)ptr - 1)&(align-1)) + 1;
+    ptr  = (char*)ptr + diff;
+    ((char*)ptr)[-1]= diff;
+    return ptr;
+}
+
+static void vlc_free(void *ptr)
+{
+    if (ptr)
+        free((char*)ptr - ((char*)ptr)[-1]);
+}
+#elif defined(__ANDROID__)
+# define vlc_memalign(align, size) memalign(align, size)
+# define vlc_free(base) free(base)
+#else
+static inline void *vlc_memalign(size_t align, size_t size)
+{
+    void *base;
+    if (unlikely(posix_memalign(&base, align, size)))
+        base = NULL;
+    return base;
+}
+# define vlc_free(base) free(base)
+#endif
 
 VLC_API void vlc_tdestroy( void *, void (*)(void *) );