Move vlc_atomic_t to <vlc_atomic.h> and correct definition

diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
index 6a1f435c6da473089684ff4ec4ffeaee3821c1fa..051e1ae1e6ecc3e9b9a3b8dbfdb096a73d1c600d 100644 (file)
--- a/include/vlc_atomic.h
+++ b/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) }
 

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 8ed688315cde41d2fbf6005d4fd20eb6760c8ad3..c04d6f3f24965af411afd7afd484c3d8b48f033e 100644 (file)
--- a/include/vlc_common.h
+++ b/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
  *****************************************************************************/

diff --git a/include/vlc_picture.h b/include/vlc_picture.h
index b58fbed3578725d5a6c90bbfe608f03505ff97f0..5c481f285ff24e405fa9f217aa5e0ebcc23b9428 100644 (file)
--- a/include/vlc_picture.h
+++ b/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

diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index c711ed09f5ad6cf9b41fb5c36275e226310d036c..c494ab222a335924ad13ece77a24edd920c74dfd 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -25,7 +25,6 @@
 #endif
 
 #include "dialogs/messages.hpp"
-#include <vlc_atomic.h>
 
 #include <QTextEdit>
 #include <QTextCursor>

diff --git a/modules/gui/qt4/dialogs/messages.hpp b/modules/gui/qt4/dialogs/messages.hpp
index d8b1157e8607f9bca3ae672bdfb8dc553432cd42..27abd2ddb7fc65e2905703afe1e4cf7c4afec4a9 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.hpp
+++ b/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;

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index e94c0c80bc1950f03fff58812a4435ba0bc0ce94..a5dd25b0586a578b0a5967a8f9a75884abb303cd 100644 (file)
--- a/src/audio_output/aout_internal.h
+++ b/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)