[vlc-commits] commit: Move vlc_atomic_t typedef to <vlc_common.h> ( Rémi Denis-Courmont )
git at videolan.org
git at videolan.org
Tue Jun 29 16:29:03 CEST 2010
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jun 29 17:25:37 2010 +0300| [a9daba19eb7d07965cfe86dda138ff88a24e590c] | committer: Rémi Denis-Courmont
Move vlc_atomic_t typedef to <vlc_common.h>
Then we don't always need to include <vlc_atomic.h>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a9daba19eb7d07965cfe86dda138ff88a24e590c
---
include/vlc_atomic.h | 9 ---------
include/vlc_common.h | 10 +++++++++-
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
index 9370fbc..51acccc 100644
--- a/include/vlc_atomic.h
+++ b/include/vlc_atomic.h
@@ -26,15 +26,6 @@
* Atomic operations do not require locking, but they are not very powerful.
*/
-/**
- * Memory storage space for an atom. Never access it directly.
- */
-typedef union
-{
- volatile uintptr_t u;
- volatile intptr_t s;
-} vlc_atomic_t;
-
/* All functions return the atom value _after_ the operation. */
VLC_EXPORT(uintptr_t, vlc_atomic_get, (const vlc_atomic_t *));
diff --git a/include/vlc_common.h b/include/vlc_common.h
index 5e48e41..371b883 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -516,6 +516,15 @@ 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
*****************************************************************************/
@@ -558,7 +567,6 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */
# define VLC_OBJECT( x ) ((vlc_object_t *)(x))
#endif
-#include <vlc_atomic.h>
typedef struct gc_object_t
{
vlc_atomic_t refs;
More information about the vlc-commits
mailing list