From 7e2b68fe2f22b4f12d876aa9385f594244a631b8 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Thu, 18 Aug 2016 17:46:19 +0530
Subject: [PATCH] plugins: Use stdint.h instead of _stdint.h

_stdint.h is generated by Autotools and we don't really need it. All
supported platforms now ship with stdint.h. The only stickler was MSVC,
and since Visual Studio 2015 it also ships stdint.h now.
---
 ext/dts/gstdtsdec.c        |  5 ++++-
 ext/resindvd/resindvdsrc.h |  4 +++-
 gst/bayer/gstbayer2rgb.c   |  6 +++++-
 gst/dccp/gstdccp_common.h  | 12 +++++++++++-
 gst/librfb/d3des.c         |  7 ++++++-
 sys/fbdev/gstfbdevsink.c   |  8 +++++++-
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/ext/dts/gstdtsdec.c b/ext/dts/gstdtsdec.c
index 095238c..70ffbc7 100644
--- a/ext/dts/gstdtsdec.c
+++ b/ext/dts/gstdtsdec.c
@@ -38,8 +38,11 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
 #include <string.h>
-#include "_stdint.h"
 #include <stdlib.h>
 
 #include <gst/gst.h>
diff --git a/ext/resindvd/resindvdsrc.h b/ext/resindvd/resindvdsrc.h
index cc2bb04..b5d8e36 100644
--- a/ext/resindvd/resindvdsrc.h
+++ b/ext/resindvd/resindvdsrc.h
@@ -23,7 +23,9 @@
 
 #include <gst/base/gstbasesrc.h>
 
-#include "_stdint.h"
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
 #include <dvdnav/dvdnav.h>
 #include <dvdread/ifo_read.h>
diff --git a/gst/bayer/gstbayer2rgb.c b/gst/bayer/gstbayer2rgb.c
index e159ca2..0b6f232 100644
--- a/gst/bayer/gstbayer2rgb.c
+++ b/gst/bayer/gstbayer2rgb.c
@@ -80,7 +80,11 @@
 #include <gst/video/video.h>
 #include <string.h>
 #include <stdlib.h>
-#include <_stdint.h>
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
 #include "gstbayerorc.h"
 
 #define GST_CAT_DEFAULT gst_bayer2rgb_debug
diff --git a/gst/dccp/gstdccp_common.h b/gst/dccp/gstdccp_common.h
index 3851e51..c88f8ef 100644
--- a/gst/dccp/gstdccp_common.h
+++ b/gst/dccp/gstdccp_common.h
@@ -38,9 +38,19 @@
 #define socklen_t int
 #endif
 #endif
+
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#include <_stdint.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
 #include <string.h>
 
 #endif /* __GST_DCCP_NET_H__ */
diff --git a/gst/librfb/d3des.c b/gst/librfb/d3des.c
index c05fea3..377670e 100644
--- a/gst/librfb/d3des.c
+++ b/gst/librfb/d3des.c
@@ -26,8 +26,13 @@
  * (GEnie : OUTER; CIS : [71755,204]) Graven Imagery, 1992.
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "_stdint.h"
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
 #include "d3des.h"
 
diff --git a/sys/fbdev/gstfbdevsink.c b/sys/fbdev/gstfbdevsink.c
index 3f9ad88..166c543 100644
--- a/sys/fbdev/gstfbdevsink.c
+++ b/sys/fbdev/gstfbdevsink.c
@@ -34,8 +34,14 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#include "_stdint.h"
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
 #include "gstfbdevsink.h"
 
-- 
2.7.4