Use inttypes.h or stdint.h as appropriate.

CVS patchset: 5411
CVS date: 2003/09/24 06:46:43

15 files changed, 108 insertions, 57 deletions

diff --git a/src/post/deinterlace/deinterlace.c b/src/post/deinterlace/deinterlace.c
index 75a5dfe51..823ae12fa 100644
--- a/src/post/deinterlace/deinterlace.c
+++ b/src/post/deinterlace/deinterlace.c
@@ -16,9 +16,14 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <dlfcn.h>
 #include <stdio.h>
 #include <stdlib.h>
+
 #include "deinterlace.h"
 
 typedef struct methodlist_item_s methodlist_item_t;
diff --git a/src/post/deinterlace/deinterlace.h b/src/post/deinterlace/deinterlace.h
index 08f07cce8..1cc7bf9b1 100644
--- a/src/post/deinterlace/deinterlace.h
+++ b/src/post/deinterlace/deinterlace.h
@@ -19,10 +19,10 @@
 #ifndef DEINTERLACE_H_INCLUDED
 #define DEINTERLACE_H_INCLUDED
 
-#if defined (__SVR4) && defined (__sun)
-# include <sys/int_types.h>
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
 #else
-# include <stdint.h>
+#include <stdint.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/post/deinterlace/plugins/double.c b/src/post/deinterlace/plugins/double.c
index 6566df293..b2d9ba8ca 100644
--- a/src/post/deinterlace/plugins/double.c
+++ b/src/post/deinterlace/plugins/double.c
@@ -18,12 +18,18 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdio.h>
-#if defined (__SVR4) && defined (__sun)
-# include <sys/int_types.h>
+
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
 #else
-# include <stdint.h>
+#include <stdint.h>
 #endif
+
 #include "speedy.h"
 #include "deinterlace.h"
 #include "plugins.h"
diff --git a/src/post/deinterlace/plugins/greedy.c b/src/post/deinterlace/plugins/greedy.c
index e12c0c1e0..68792734e 100644
--- a/src/post/deinterlace/plugins/greedy.c
+++ b/src/post/deinterlace/plugins/greedy.c
@@ -19,17 +19,18 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <stdio.h>
-#if defined (__SVR4) && defined (__sun)
-# include <sys/int_types.h>
-#else
-# include <stdint.h>
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <stdio.h>
+
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#else
+#include <stdint.h>
+#endif
+
 #include "attributes.h"
 #include "xineutils.h"
 #include "deinterlace.h"
diff --git a/src/post/deinterlace/plugins/greedy2frame.c b/src/post/deinterlace/plugins/greedy2frame.c
index 065bd2ac8..5a54bf53e 100644
--- a/src/post/deinterlace/plugins/greedy2frame.c
+++ b/src/post/deinterlace/plugins/greedy2frame.c
@@ -19,17 +19,18 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <stdio.h>
-#if defined (__SVR4) && defined (__sun)
-# include <sys/int_types.h>
-#else
-# include <stdint.h>
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <stdio.h>
+
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#else
+#include <stdint.h>
+#endif
+
 #include "attributes.h"
 #include "xineutils.h"
 #include "deinterlace.h"
diff --git a/src/post/deinterlace/plugins/linear.c b/src/post/deinterlace/plugins/linear.c
index 8d2e23f29..f5cc92e1b 100644
--- a/src/post/deinterlace/plugins/linear.c
+++ b/src/post/deinterlace/plugins/linear.c
@@ -16,12 +16,18 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdio.h>
-#if defined (__SVR4) && defined (__sun)
-# include <sys/int_types.h>
+
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
 #else
-# include <stdint.h>
+#include <stdint.h>
 #endif
+
 #include "speedy.h"
 #include "deinterlace.h"
 #include "plugins.h"
diff --git a/src/post/deinterlace/plugins/linearblend.c b/src/post/deinterlace/plugins/linearblend.c
index 8caaac5e7..ef7ab52bc 100644
--- a/src/post/deinterlace/plugins/linearblend.c
+++ b/src/post/deinterlace/plugins/linearblend.c
@@ -21,17 +21,18 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <stdio.h>
-#if defined (__SVR4) && defined (__sun)
-# include <sys/int_types.h>
-#else
-# include <stdint.h>
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <stdio.h>
+
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#else
+#include <stdint.h>
+#endif
+
 #include "attributes.h"
 #include "xineutils.h"
 #include "speedtools.h"
diff --git a/src/post/deinterlace/plugins/vfir.c b/src/post/deinterlace/plugins/vfir.c
index ddf2ae4c8..9a2d89ee8 100644
--- a/src/post/deinterlace/plugins/vfir.c
+++ b/src/post/deinterlace/plugins/vfir.c
@@ -21,17 +21,18 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <stdio.h>
-#if defined (__SVR4) && defined (__sun)
-# include <sys/int_types.h>
-#else
-# include <stdint.h>
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <stdio.h>
+
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#else
+#include <stdint.h>
+#endif
+
 #include "attributes.h"
 #include "xineutils.h"
 #include "speedy.h"
diff --git a/src/post/deinterlace/plugins/weave.c b/src/post/deinterlace/plugins/weave.c
index 7107a07a6..109cafe2d 100644
--- a/src/post/deinterlace/plugins/weave.c
+++ b/src/post/deinterlace/plugins/weave.c
@@ -18,12 +18,18 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdio.h>
-#if defined (__SVR4) && defined (__sun)
-# include <sys/int_types.h>
+
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
 #else
-# include <stdint.h>
+#include <stdint.h>
 #endif
+
 #include "speedy.h"
 #include "deinterlace.h"
 #include "plugins.h"
diff --git a/src/post/deinterlace/pulldown.c b/src/post/deinterlace/pulldown.c
index 0b9ccf57e..fc166ae99 100644
--- a/src/post/deinterlace/pulldown.c
+++ b/src/post/deinterlace/pulldown.c
@@ -16,9 +16,20 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdio.h>
 #include <limits.h>
 #include <string.h>
+
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#else
+#include <stdint.h>
+#endif
+
 #include "pulldown.h"
 
 /**
diff --git a/src/post/deinterlace/pulldown.h b/src/post/deinterlace/pulldown.h
index bcf17ced9..13868f30f 100644
--- a/src/post/deinterlace/pulldown.h
+++ b/src/post/deinterlace/pulldown.h
@@ -19,11 +19,12 @@
 #ifndef PULLDOWN_H_INCLUDED
 #define PULLDOWN_H_INCLUDED
 
-#if defined (__SVR4) && defined (__sun)
-# include <sys/int_types.h>
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
 #else
-# include <stdint.h>
+#include <stdint.h>
 #endif
+
 #include "speedy.h"
 
 #ifdef __cplusplus
diff --git a/src/post/deinterlace/speedy.c b/src/post/deinterlace/speedy.c
index a49bf776d..4d3b9710a 100644
--- a/src/post/deinterlace/speedy.c
+++ b/src/post/deinterlace/speedy.c
@@ -49,11 +49,17 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#else
+#include <stdint.h>
 #endif
 
 #include "attributes.h"
diff --git a/src/post/deinterlace/speedy.h b/src/post/deinterlace/speedy.h
index 3b835f5a6..7bc1a6535 100644
--- a/src/post/deinterlace/speedy.h
+++ b/src/post/deinterlace/speedy.h
@@ -19,10 +19,10 @@
 #ifndef SPEEDY_H_INCLUDED
 #define SPEEDY_H_INCLUDED
 
-#if defined (__SVR4) && defined (__sun)
-# include <sys/int_types.h>
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
 #else
-# include <stdint.h>
+#include <stdint.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/post/deinterlace/tvtime.c b/src/post/deinterlace/tvtime.c
index 5f3e66281..db8911311 100644
--- a/src/post/deinterlace/tvtime.c
+++ b/src/post/deinterlace/tvtime.c
@@ -16,28 +16,28 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <math.h>
-#if defined (__SVR4) && defined (__sun)
-# include <sys/int_types.h>
+
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
 #else
-# include <stdint.h>
+#include <stdint.h>
 #endif
+
 #include "speedy.h"
 #include "deinterlace.h"
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "pulldown.h"
 #include "tvtime.h"
 
-
 /* use tvtime_t */
 #define pulldown_alg this->pulldown_alg
 #define curmethod this->curmethod
diff --git a/src/post/deinterlace/tvtime.h b/src/post/deinterlace/tvtime.h
index 3b435e639..f07c8ea87 100644
--- a/src/post/deinterlace/tvtime.h
+++ b/src/post/deinterlace/tvtime.h
@@ -19,6 +19,12 @@
 #ifndef TVTIME_H_INCLUDED
 #define TVTIME_H_INCLUDED
 
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#else
+#include <stdint.h>
+#endif
+
 #include "deinterlace.h"
 
 /**