Move vlc_atomic_t to <vlc_atomic.h> and correct definition

include/vlc_atomic.h

@@ -203,6 +203,14 @@ bool vlc_atomic_compare_exchange(volatile void *object, void *expected,
 
 # endif
 
+/**
+ * Memory storage space for an atom. Never access it directly.
+ */
+typedef union
+{
+    atomic_uintptr_t u;
+} vlc_atomic_t;
+
 /** Static initializer for \ref vlc_atomic_t */
 # define VLC_ATOMIC_INIT(val) { (val) }
 

include/vlc_common.h

@@ -444,15 +444,6 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 #include "vlc_mtime.h"
 #include "vlc_threads.h"
 
-/**
- * Memory storage space for an atom. Never access it directly.
- */
-typedef union
-{
-    volatile uintptr_t u;
-    volatile intptr_t  s;
-} vlc_atomic_t;
-
 /*****************************************************************************
  * Common structure members
  *****************************************************************************/

include/vlc_picture.h

@@ -32,6 +32,7 @@
  */
 
 #include <vlc_es.h>
+#include <vlc_atomic.h>
 
 /** Description of a planar graphic field */
 typedef struct plane_t

modules/gui/qt4/dialogs/messages.cpp

@@ -25,7 +25,6 @@
 #endif
 
 #include "dialogs/messages.hpp"
-#include <vlc_atomic.h>
 
 #include <QTextEdit>
 #include <QTextCursor>

modules/gui/qt4/dialogs/messages.hpp

@@ -28,6 +28,7 @@
 #include "util/singleton.hpp"
 #include "ui/messages_panel.h"
 #include <stdarg.h>
+#include <vlc_atomic.h>
 
 class QTabWidget;
 class QPushButton;

src/audio_output/aout_internal.h

@@ -24,6 +24,8 @@
 #ifndef LIBVLC_AOUT_INTERNAL_H
 # define LIBVLC_AOUT_INTERNAL_H 1
 
+# include <vlc_atomic.h>
+
 /* Max input rate factor (1/4 -> 4) */
 # define AOUT_MAX_INPUT_RATE (4)