From a9daba19eb7d07965cfe86dda138ff88a24e590c Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 29 Jun 2010 17:25:37 +0300 Subject: [PATCH] Move vlc_atomic_t typedef to Then we don't always need to include --- 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 9370fbc899..51acccc726 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 5e48e418f1..371b883e30 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 typedef struct gc_object_t { vlc_atomic_t refs; -- 2.39.2