From 6075feb4875ed2035de460fcdc7858f314ad0bef Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sat, 21 Jan 2017 14:20:55 +0000
Subject: create netsurf inttypes header to have portable integer formatting
 macros

---
 frontends/amiga/iff_dr2d.c            | 2 +-
 frontends/atari/bitmap.c              | 2 +-
 frontends/atari/cookies.c             | 2 +-
 frontends/atari/deskmenu.c            | 1 +
 frontends/atari/font.c                | 2 +-
 frontends/atari/treeview.c            | 2 +-
 frontends/framebuffer/font_freetype.c | 2 +-
 frontends/gtk/window.c                | 2 +-
 frontends/riscos/url_complete.h       | 3 +--
 frontends/riscos/window.c             | 3 ++-
 frontends/windows/font.c              | 2 +-
 11 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'frontends')

diff --git a/frontends/amiga/iff_dr2d.c b/frontends/amiga/iff_dr2d.c
index 91973f43b..a4c5855a1 100644
--- a/frontends/amiga/iff_dr2d.c
+++ b/frontends/amiga/iff_dr2d.c
@@ -20,12 +20,12 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <inttypes.h>
 #include <svgtiny.h>
 #include <proto/exec.h>
 #include <string.h>
 #include <proto/dos.h>
 
+#include "netsurf/inttypes.h"
 #ifndef AMIGA_DR2D_STANDALONE
 #include "utils/nsurl.h"
 #include "netsurf/content.h"
diff --git a/frontends/atari/bitmap.c b/frontends/atari/bitmap.c
index d0de37881..cbb719586 100644
--- a/frontends/atari/bitmap.c
+++ b/frontends/atari/bitmap.c
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <inttypes.h>
 #include <sys/types.h>
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "netsurf/bitmap.h"
diff --git a/frontends/atari/cookies.c b/frontends/atari/cookies.c
index a49aec794..9045009fc 100644
--- a/frontends/atari/cookies.c
+++ b/frontends/atari/cookies.c
@@ -17,8 +17,8 @@
  */
 
 #include <assert.h>
-#include <inttypes.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "netsurf/mouse.h"
diff --git a/frontends/atari/deskmenu.c b/frontends/atari/deskmenu.c
index 77df4e568..addba2764 100644
--- a/frontends/atari/deskmenu.c
+++ b/frontends/atari/deskmenu.c
@@ -23,6 +23,7 @@
 #include "utils/nsurl.h"
 #include "utils/messages.h"
 #include "utils/nsoption.h"
+#include "utils/utils.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/keypress.h"
 #include "desktop/save_complete.h"
diff --git a/frontends/atari/font.c b/frontends/atari/font.c
index 5402e7870..79716551f 100644
--- a/frontends/atari/font.c
+++ b/frontends/atari/font.c
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <inttypes.h>
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/utf8.h"
 #include "utils/log.h"
 #include "utils/nsoption.h"
diff --git a/frontends/atari/treeview.c b/frontends/atari/treeview.c
index 731c032e3..78da2b097 100644
--- a/frontends/atari/treeview.c
+++ b/frontends/atari/treeview.c
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <inttypes.h>
 #include <sys/types.h>
 #include <string.h>
 
 #include "assert.h"
 #include "cflib.h"
 
+#include "netsurf/inttypes.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c
index ccc60ea47..e7c07f5ff 100644
--- a/frontends/framebuffer/font_freetype.c
+++ b/frontends/framebuffer/font_freetype.c
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <inttypes.h>
 #include <assert.h>
 
 #include <ft2build.h>
 #include FT_CACHE_H
 
+#include "netsurf/inttypes.h"
 #include "utils/filepath.h"
 #include "utils/utf8.h"
 #include "utils/log.h"
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index abfda9305..326e57395 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -23,7 +23,6 @@
  */
 
 #include <stdlib.h>
-#include <inttypes.h>
 #include <string.h>
 #include <limits.h>
 #include <assert.h>
@@ -32,6 +31,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/log.h"
 #include "utils/utf8.h"
 #include "utils/nsoption.h"
diff --git a/frontends/riscos/url_complete.h b/frontends/riscos/url_complete.h
index 6a4660e4a..92436129e 100644
--- a/frontends/riscos/url_complete.h
+++ b/frontends/riscos/url_complete.h
@@ -23,9 +23,8 @@
 #ifndef _NETSURF_RISCOS_URLCOMPLETE_H_
 #define _NETSURF_RISCOS_URLCOMPLETE_H_
 
-#include <inttypes.h>
 #include <stdbool.h>
-#include "oslib/wimp.h"
+#include <oslib/wimp.h>
 
 struct gui_window;
 
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index 45d5b1461..b1ea58ae1 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -29,10 +29,10 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <inttypes.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <time.h>
 #include <string.h>
 #include <oslib/colourtrans.h>
@@ -43,6 +43,7 @@
 #include <oslib/wimpspriteop.h>
 #include <nsutils/time.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/talloc.h"
diff --git a/frontends/windows/font.c b/frontends/windows/font.c
index 791b8cd5c..f50ba6e9e 100644
--- a/frontends/windows/font.c
+++ b/frontends/windows/font.c
@@ -23,10 +23,10 @@
  */
 
 #include "utils/config.h"
-#include <inttypes.h>
 #include <assert.h>
 #include <windows.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/log.h"
 #include "utils/nsoption.h"
 #include "utils/utf8.h"
-- 
cgit v1.2.3