Use Qt 4.4.0 for the Mac, too

[vlc] / include / vlc_common.h

diff --git a/include/vlc_common.h b/include/vlc_common.h
index d44837134574a2232692cc2f7b25ab66e689ddff..451a008926ba35707d652a98a9ddf57a32da7948 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -440,7 +440,6 @@ struct vlc_list_t
 #define VLC_ENOMOD         -10                           /* Module not found */
 
 #define VLC_ENOOBJ         -20                           /* Object not found */
-#define VLC_EBADOBJ        -21                            /* Bad object type */
 
 #define VLC_ENOVAR         -30                         /* Variable not found */
 #define VLC_EBADVAR        -31                         /* Bad variable value */
@@ -514,10 +513,6 @@ typedef struct vlc_object_internals_t vlc_object_internals_t;
     char *psz_header;                                                       \
     int  i_flags;                                                           \
                                                                             \
-    /* Object access lock */                                                \
-    vlc_mutex_t  object_lock;                                               \
-    vlc_cond_t   object_wait;                                               \
-                                                                            \
     /* Object properties */                                                 \
     volatile bool b_error;                  /**< set by the object */ \
     volatile bool b_die;                   /**< set by the outside */ \