Cosmetics + A calloc check.

[vlc] / include / vlc_common.h

diff --git a/include/vlc_common.h b/include/vlc_common.h
index a8308b81b9bfe955f33a39b794a68e8b995d6244..c4b4f4e758c139482702960a4af0d2db27e86f18 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -376,18 +376,14 @@ typedef struct meta_engine_t meta_engine_t;
 
 /* stat/lstat/fstat */
 #ifdef WIN32
-# ifdef UNDER_CE
-# undef _STAT_DEFINED
-# endif
 #include <sys/stat.h>
+
 # ifndef UNDER_CE
 struct _stati64;
 #define stat _stati64
 #define fstat _fstati64
-# else
-# define stat _stat
-# define fstat _fstat
-# endif
+#endif
+
 /* You should otherwise use utf8_stat and utf8_lstat. */
 #else
 struct stat;
@@ -502,11 +498,6 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 #if defined( WIN32 ) || defined( UNDER_CE )
 #   define WIN32_LEAN_AND_MEAN
 #   include <windows.h>
-#   if defined( UNDER_CE )
-#      define IS_WINNT 0
-#   else
-#      define IS_WINNT ( GetVersion() < 0x80000000 )
-#   endif
 #endif
 
 #include "vlc_mtime.h"
@@ -533,7 +524,7 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
     /* Object properties */                                                 \
     volatile bool b_error;                  /**< set by the object */ \
     volatile bool b_die;                   /**< set by the outside */ \
-    bool b_force;      /**< set by the outside (eg. module_Need()) */ \
+    bool b_force;      /**< set by the outside (eg. module_need()) */ \
                                                                             \
     /** Just a reminder so that people don't cast garbage */                \
     bool be_sure_to_add_VLC_COMMON_MEMBERS_to_struct;                       \