* Got rid of int_types.h and did a few changes Ipkiss will need. Hope I

    did not break other platforms.

diff --git a/include/common.h b/include/common.h
index c153a4c11669cf6786286aae897949b700c61de4..6449069fc95ff7e1a6e8d84bf8fe657a7ee40ad1 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.82 2002/03/02 09:34:23 gbazin Exp $
+ * $Id: common.h,v 1.83 2002/03/03 04:37:29 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -34,11 +34,28 @@
  * Basic types definitions
  *****************************************************************************/
 
+typedef unsigned char       u8;
+typedef signed char         s8;
+
+typedef unsigned short      u16;
+typedef signed short        s16;
+
+typedef unsigned int        u32;
+typedef signed int          s32;
+
+#if defined( _MSC_VER ) || ( defined( WIN32 ) && !defined( __MINGW32__ ) )
+typedef unsigned __int64    u64;
+typedef signed __int64      s64;
+#else
+typedef unsigned long long  u64;
+typedef signed long long    s64;
+#endif
+
 typedef u8                  byte_t;
 
 /* Boolean type */
 #ifdef BOOLEAN_T_IN_SYS_TYPES_H
-#   /* <sys/types.h> already included */
+    /* <sys/types.h> already included */
 #elif defined(BOOLEAN_T_IN_PTHREAD_H)
 #   include <pthread.h>
 #elif defined(BOOLEAN_T_IN_CTHREADS_H)
@@ -66,7 +83,6 @@ typedef int                 ptrdiff_t;
 typedef int                 ssize_t;
 #endif
 
-
 /* Counter for statistics and profiling */
 typedef unsigned long       count_t;
 
@@ -373,7 +389,7 @@ struct intf_subscription_s;
 #   endif
 
 /* win32, cl and icl support */
-#   if defined( _MSC_VER )
+#   if defined( _MSC_VER ) || !defined( __MINGW32__ )
 #       define __attribute__(x)
 #       define __inline__      __inline
 #       define strncasecmp     strnicmp

diff --git a/include/int_types.h b/include/int_types.h
deleted file mode 100644 (file)
index bc5a1a9..0000000
--- a/include/int_types.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * int_types.h: internal types
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: int_types.h,v 1.7 2001/05/31 01:37:08 sam Exp $
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- *****************************************************************************/
-
-/* Basic types definitions */
-typedef unsigned char           u8;
-typedef signed char             s8;
-typedef unsigned short          u16;
-typedef signed short            s16;
-typedef unsigned int            u32;
-typedef signed int              s32;
-#if defined( _MSC_VER )
-typedef unsigned __int64        u64;
-typedef signed __int64          s64;
-#else
-typedef unsigned long long      u64;
-typedef signed long long        s64;
-#endif

diff --git a/include/videolan/vlc.h b/include/videolan/vlc.h
index 92cb66f282db05b3298961a820c12fa9619ff700..ed99f9f01bcd2a92f5c72bd932cf3c9a51f6a42e 100644 (file)
--- a/include/videolan/vlc.h
+++ b/include/videolan/vlc.h
@@ -2,7 +2,7 @@
  * vlc.h: global header for vlc
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc.h,v 1.4 2002/02/24 20:51:09 gbazin Exp $
+ * $Id: vlc.h,v 1.5 2002/03/03 04:37:29 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -28,7 +28,6 @@
  *****************************************************************************/
 #include "defs.h"
 #include "config.h"
-#include "int_types.h"
 
 #if defined( PLUGIN ) || defined( BUILTIN )
 #   include "modules_inner.h"

diff --git a/plugins/mpeg_adec/adec_math.c b/plugins/mpeg_adec/adec_math.c
index 039b2246765c7e2fcfa7630ad3a6d5dcc3850a8a..75bd38304e53d11fa8ee66b36be5132f88ec708d 100644 (file)
--- a/plugins/mpeg_adec/adec_math.c
+++ b/plugins/mpeg_adec/adec_math.c
@@ -2,7 +2,7 @@
  * adec_math.c: Inverse Discrete Cosine Transform and Pulse Code Modulation
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: adec_math.c,v 1.2 2002/02/24 22:06:50 sam Exp $
+ * $Id: adec_math.c,v 1.3 2002/03/03 04:37:29 sam Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Michel Lespinasse <walken@via.ecp.fr>
@@ -22,7 +22,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include "int_types.h"
+#include <videolan/vlc.h>
+
 #include "mpeg_adec_generic.h"
 
 /*****************************************************************************