* ./include/*, ./src/*: separated WIN32 #tests and UNDER_CE #tests, because

[vlc] / include / main.h

diff --git a/include/main.h b/include/main.h
index 7f93dc96b1bea472c8f1d2c9994a0cec99bc8775..5e67e90bbaa45e7abd924447f5e77d4be7f54bc3 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -3,7 +3,7 @@
  * Declaration and extern access to global program object.
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: main.h,v 1.50 2002/11/10 18:04:22 sam Exp $
+ * $Id: main.h,v 1.51 2002/11/11 14:39:11 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -37,7 +37,7 @@ struct libvlc_t
     vlc_bool_t             b_ready;
 
     /* CPU extensions */
-    u32                    i_cpu;
+    uint32_t               i_cpu;
 
     /* Generic settings */
     int                    i_verbose;                       /* info messages */
@@ -83,7 +83,7 @@ struct vlc_t
 
     /* Fast memcpy plugin used */
     module_t *             p_memcpy_module;
-#if defined( WIN32 )
+#if defined( UNDER_CE )
     void* ( __cdecl *pf_memcpy ) ( void *, const void *, size_t );
     void* ( __cdecl *pf_memset ) ( void *, int, size_t );
 #else