Merge pull request #1484 from mayeut/mandatory-inttypes-stdint

Require `stdint.h` & `inttypes.h`

15 files changed, 15 insertions, 15 deletions

diff --git a/src/lib/openjpip/box_manager.c b/src/lib/openjpip/box_manager.c
index eb6b9d4c..fc3550a7 100644
--- a/src/lib/openjpip/box_manager.c
+++ b/src/lib/openjpip/box_manager.c
@@ -33,8 +33,8 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <assert.h>
+#include <inttypes.h>
 #include "box_manager.h"
-#include "opj_inttypes.h"
 
 #ifdef SERVER
 #include "fcgi_stdio.h"
diff --git a/src/lib/openjpip/boxheader_manager.c b/src/lib/openjpip/boxheader_manager.c
index f5958f64..d8f6ae6f 100644
--- a/src/lib/openjpip/boxheader_manager.c
+++ b/src/lib/openjpip/boxheader_manager.c
@@ -32,8 +32,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
+#include <inttypes.h>
 #include "boxheader_manager.h"
-#include "opj_inttypes.h"
 
 #ifdef SERVER
 #include "fcgi_stdio.h"
diff --git a/src/lib/openjpip/byte_manager.h b/src/lib/openjpip/byte_manager.h
index 57a7d501..02c806e0 100644
--- a/src/lib/openjpip/byte_manager.h
+++ b/src/lib/openjpip/byte_manager.h
@@ -32,8 +32,8 @@
 #define     BYTE_MANAGER_H_
 
 #include <stddef.h>
+#include <stdint.h>
 #include "openjpeg.h"
-#include "opj_stdint.h"
 typedef uint8_t Byte_t;
 typedef uint16_t Byte2_t;
 typedef uint32_t Byte4_t;
diff --git a/src/lib/openjpip/cachemodel_manager.c b/src/lib/openjpip/cachemodel_manager.c
index 0888fc9c..3e825b8e 100644
--- a/src/lib/openjpip/cachemodel_manager.c
+++ b/src/lib/openjpip/cachemodel_manager.c
@@ -30,9 +30,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <inttypes.h>
 #include "cachemodel_manager.h"
 #include "faixbox_manager.h"
-#include "opj_inttypes.h"
 
 #ifdef SERVER
 #include "fcgi_stdio.h"
diff --git a/src/lib/openjpip/codestream_manager.c b/src/lib/openjpip/codestream_manager.c
index 76a1a34f..56ddd39c 100644
--- a/src/lib/openjpip/codestream_manager.c
+++ b/src/lib/openjpip/codestream_manager.c
@@ -29,8 +29,8 @@
  */
 
 #include <stdio.h>
+#include <inttypes.h>
 #include "codestream_manager.h"
-#include "opj_inttypes.h"
 
 #ifdef SERVER
 #include "fcgi_stdio.h"
diff --git a/src/lib/openjpip/dec_clientmsg_handler.c b/src/lib/openjpip/dec_clientmsg_handler.c
index c257255a..07d51630 100644
--- a/src/lib/openjpip/dec_clientmsg_handler.c
+++ b/src/lib/openjpip/dec_clientmsg_handler.c
@@ -33,11 +33,11 @@
 #include <string.h>
 #include <assert.h>
 #include <limits.h>
+#include <inttypes.h>
 #include "dec_clientmsg_handler.h"
 #include "ihdrbox_manager.h"
 #include "jpipstream_manager.h"
 #include "jp2k_encoder.h"
-#include "opj_inttypes.h"
 
 void handle_JPIPstreamMSG(SOCKET connected_socket, cachelist_param_t *cachelist,
                           Byte_t **jpipstream, OPJ_SIZE_T *streamlen, msgqueue_param_t *msgqueue)
diff --git a/src/lib/openjpip/faixbox_manager.c b/src/lib/openjpip/faixbox_manager.c
index d0b410a2..55253afa 100644
--- a/src/lib/openjpip/faixbox_manager.c
+++ b/src/lib/openjpip/faixbox_manager.c
@@ -30,8 +30,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <inttypes.h>
 #include "faixbox_manager.h"
-#include "opj_inttypes.h"
 
 #ifdef SERVER
 #include "fcgi_stdio.h"
diff --git a/src/lib/openjpip/index_manager.c b/src/lib/openjpip/index_manager.c
index 64e760d7..17f5887a 100644
--- a/src/lib/openjpip/index_manager.c
+++ b/src/lib/openjpip/index_manager.c
@@ -32,8 +32,8 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
+#include <inttypes.h>
 
-#include "opj_inttypes.h"
 #include "index_manager.h"
 #include "box_manager.h"
 #include "manfbox_manager.h"
diff --git a/src/lib/openjpip/jp2k_encoder.c b/src/lib/openjpip/jp2k_encoder.c
index 80b98c7e..296c1efb 100644
--- a/src/lib/openjpip/jp2k_encoder.c
+++ b/src/lib/openjpip/jp2k_encoder.c
@@ -34,10 +34,10 @@
 #include <string.h>
 #include <math.h>
 #include <assert.h>
+#include <inttypes.h>
 #include "jp2k_encoder.h"
 #include "j2kheader_manager.h"
 #include "imgreg_manager.h"
-#include "opj_inttypes.h"
 
 
 #ifdef SERVER
diff --git a/src/lib/openjpip/metadata_manager.c b/src/lib/openjpip/metadata_manager.c
index d7128b94..697f96fb 100644
--- a/src/lib/openjpip/metadata_manager.c
+++ b/src/lib/openjpip/metadata_manager.c
@@ -29,7 +29,7 @@
  */
 
 #include "metadata_manager.h"
-#include "opj_inttypes.h"
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/lib/openjpip/mhixbox_manager.c b/src/lib/openjpip/mhixbox_manager.c
index 1a8eaa08..5f3bdfd6 100644
--- a/src/lib/openjpip/mhixbox_manager.c
+++ b/src/lib/openjpip/mhixbox_manager.c
@@ -31,8 +31,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <inttypes.h>
 #include "mhixbox_manager.h"
-#include "opj_inttypes.h"
 
 #ifdef SERVER
 #include "fcgi_stdio.h"
diff --git a/src/lib/openjpip/msgqueue_manager.c b/src/lib/openjpip/msgqueue_manager.c
index c6596271..5f939a95 100644
--- a/src/lib/openjpip/msgqueue_manager.c
+++ b/src/lib/openjpip/msgqueue_manager.c
@@ -37,6 +37,7 @@
 #include <ctype.h>
 #include <assert.h>
 #include <limits.h>
+#include <inttypes.h>
 #ifdef _WIN32
 #include <io.h>
 #else
@@ -45,7 +46,6 @@
 #include "msgqueue_manager.h"
 #include "metadata_manager.h"
 #include "index_manager.h"
-#include "opj_inttypes.h"
 
 #ifdef SERVER
 #include "fcgi_stdio.h"
diff --git a/src/lib/openjpip/placeholder_manager.c b/src/lib/openjpip/placeholder_manager.c
index 2ffa2034..9d73567f 100644
--- a/src/lib/openjpip/placeholder_manager.c
+++ b/src/lib/openjpip/placeholder_manager.c
@@ -31,8 +31,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <inttypes.h>
 #include "placeholder_manager.h"
-#include "opj_inttypes.h"
 
 #ifdef SERVER
 #include "fcgi_stdio.h"
diff --git a/src/lib/openjpip/query_parser.c b/src/lib/openjpip/query_parser.c
index 9b2fac2d..e192c73c 100644
--- a/src/lib/openjpip/query_parser.c
+++ b/src/lib/openjpip/query_parser.c
@@ -42,8 +42,8 @@
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include "query_parser.h"
-#include "opj_stdint.h"
 
 #ifdef SERVER
 #include "fcgi_stdio.h"
diff --git a/src/lib/openjpip/sock_manager.h b/src/lib/openjpip/sock_manager.h
index 01d97574..f33306c0 100644
--- a/src/lib/openjpip/sock_manager.h
+++ b/src/lib/openjpip/sock_manager.h
@@ -32,7 +32,7 @@
 # define    SOCK_MANAGER_H_
 
 #include "byte_manager.h"
-#include "opj_stdint.h"
+#include <stdint.h>
 
 #ifdef _WIN32
 #include <winsock.h>