Support C++98.

ponchio · May 27, 2018 · 2c4a570 · 2c4a570
1 parent c6b56a8
commit 2c4a570
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 7 deletions.
diff --git a/atom.h b/atom.h
@@ -3,7 +3,13 @@
 
 #include <vector>
 #include <string>
-#include <cstdint>
+#if (__cplusplus >= 201103L)
+# include <cstdint>
+#else
+extern "C" {
+# include <stdint.h>
+};
+#endif
 
 #include "file.h"
 

diff --git a/file.h b/file.h
@@ -23,7 +23,13 @@
 
 #include <vector>
 #include <string>
-#include <cstdint>
+#if (__cplusplus >= 201103L)
+# include <cstdint>
+#else
+extern "C" {
+# include <stdint.h>
+};
+#endif
 #include <cstdio>
 
 uint16_t swap16(uint16_t us);

diff --git a/mp4.cpp b/mp4.cpp
@@ -27,15 +27,27 @@
 #ifndef __STDC_CONSTANT_MACROS
 # define __STDC_CONSTANT_MACROS	1
 #endif
-#include <cstdint>
+#if (__cplusplus >= 201103L)
+# include <cstdint>
+#else
+extern "C" {
+# include <stdint.h>
+};
+#endif
 #ifndef INT64_C
 # define INT64_C(c)	(c ## LL)
 # define UINT64_C(c)	(c ## ULL)
 #endif
 
 extern "C" {
-#include "libavcodec/avcodec.h"
-#include "libavformat/avformat.h"
+#undef __bool_true_false_are_defined    // Prevent #define of bool, true & false.
+#define __bool_true_false_are_defined   1
+#ifndef _Bool
+# define _Bool  bool
+#endif
+
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 }
 
 #include "mp4.h"

diff --git a/track.cpp b/track.cpp
@@ -27,14 +27,25 @@
 #ifndef __STDC_CONSTANT_MACROS
 # define __STDC_CONSTANT_MACROS 1
 #endif
-#include <cstdint>
+#if (__cplusplus >= 201103L)
+# include <cstdint>
+#else
+extern "C" {
+# include <stdint.h>
+};
+#endif
 #ifndef INT64_C
 # define INT64_C(c)     (c ## LL)
 # define UINT64_C(c)    (c ## ULL)
 #endif
-#include <cstdbool> // Define C11 bool used in internal header included below.
 
 extern "C" {
+#undef __bool_true_false_are_defined    // Prevent #define of bool, true & false.
+#define __bool_true_false_are_defined   1
+#ifndef _Bool
+# define _Bool  bool
+#endif
+
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>