From d5bb4be5b44c370ee2e76cfabaf0f52723534394 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Sat, 4 Feb 2012 11:06:12 +1100
Subject: [PATCH] Patch from David Yeo to conditionally include <inttypes.h>.

---
 examples/c/decode/file/main.c                  | 3 +++
 examples/c/encode/file/main.c                  | 3 +++
 src/metaflac/operations.c                      | 3 +++
 src/metaflac/operations_shorthand_cuesheet.c   | 3 +++
 src/metaflac/operations_shorthand_streaminfo.c | 3 +++
 src/share/grabbag/cuesheet.c                   | 3 +++
 src/test_libFLAC/encoders.c                    | 3 +++
 src/test_libFLAC/metadata_object.c             | 3 +++
 src/test_libs_common/metadata_utils.c          | 3 +++
 src/test_seeking/main.c                        | 3 +++
 10 files changed, 30 insertions(+)

diff --git a/examples/c/decode/file/main.c b/examples/c/decode/file/main.c
index e5138b4f..f7efd9a9 100644
--- a/examples/c/decode/file/main.c
+++ b/examples/c/decode/file/main.c
@@ -28,6 +28,9 @@
 #  include <config.h>
 #endif
 
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include "FLAC/stream_decoder.h"
diff --git a/examples/c/encode/file/main.c b/examples/c/encode/file/main.c
index 1baad1d3..bce97327 100644
--- a/examples/c/encode/file/main.c
+++ b/examples/c/encode/file/main.c
@@ -28,6 +28,9 @@
 #  include <config.h>
 #endif
 
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/metaflac/operations.c b/src/metaflac/operations.c
index 88e469a5..369883ab 100644
--- a/src/metaflac/operations.c
+++ b/src/metaflac/operations.c
@@ -27,6 +27,9 @@
 #include "FLAC/metadata.h"
 #include "share/alloc.h"
 #include "share/grabbag.h"
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/metaflac/operations_shorthand_cuesheet.c b/src/metaflac/operations_shorthand_cuesheet.c
index f4142359..dadb53ba 100644
--- a/src/metaflac/operations_shorthand_cuesheet.c
+++ b/src/metaflac/operations_shorthand_cuesheet.c
@@ -21,6 +21,9 @@
 #endif
 
 #include <errno.h>
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 #include <stdio.h> /* for snprintf() */
 #include <string.h>
 #include "options.h"
diff --git a/src/metaflac/operations_shorthand_streaminfo.c b/src/metaflac/operations_shorthand_streaminfo.c
index b4471189..10194596 100644
--- a/src/metaflac/operations_shorthand_streaminfo.c
+++ b/src/metaflac/operations_shorthand_streaminfo.c
@@ -24,6 +24,9 @@
 #include "utils.h"
 #include "FLAC/assert.h"
 #include "FLAC/metadata.h"
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 #include <string.h>
 #include "operations_shorthand.h"
 
diff --git a/src/share/grabbag/cuesheet.c b/src/share/grabbag/cuesheet.c
index 3d7e3587..0299cba1 100644
--- a/src/share/grabbag/cuesheet.c
+++ b/src/share/grabbag/cuesheet.c
@@ -22,6 +22,9 @@
 
 #include "share/grabbag.h"
 #include "FLAC/assert.h"
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/test_libFLAC/encoders.c b/src/test_libFLAC/encoders.c
index 326cdef4..403e808c 100644
--- a/src/test_libFLAC/encoders.c
+++ b/src/test_libFLAC/encoders.c
@@ -21,6 +21,9 @@
 #endif
 
 #include <errno.h>
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/test_libFLAC/metadata_object.c b/src/test_libFLAC/metadata_object.c
index 571164dd..8e3ba7a0 100644
--- a/src/test_libFLAC/metadata_object.c
+++ b/src/test_libFLAC/metadata_object.c
@@ -24,6 +24,9 @@
 #include "FLAC/metadata.h"
 #include "test_libs_common/metadata_utils.h"
 #include "metadata.h"
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h> /* for malloc() */
 #include <string.h> /* for memcmp() */
diff --git a/src/test_libs_common/metadata_utils.c b/src/test_libs_common/metadata_utils.c
index a9551637..ac73db96 100644
--- a/src/test_libs_common/metadata_utils.c
+++ b/src/test_libs_common/metadata_utils.c
@@ -26,6 +26,9 @@
 
 #include "FLAC/metadata.h"
 #include "test_libs_common/metadata_utils.h"
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h> /* for malloc() */
 #include <string.h> /* for memcmp() */
diff --git a/src/test_seeking/main.c b/src/test_seeking/main.c
index 734d606b..5a56bf99 100644
--- a/src/test_seeking/main.c
+++ b/src/test_seeking/main.c
@@ -20,6 +20,9 @@
 #  include <config.h>
 #endif
 
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>