From 6a53b447e5726bc7d7b8405b1b1dd958c701b007 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 29 Jun 2019 16:09:45 -0700
Subject: Declare global variables as extern in headers

Otherwise, each source file that includes the header will create a
new definition, which are usually merged together by the linker.

Multiple definitions of an object is not allowed in ISO C.
---
 frontends/atari/bitmap.h   | 2 +-
 frontends/atari/encoding.h | 2 +-
 frontends/atari/file.h     | 2 +-
 frontends/atari/font.h     | 2 +-
 frontends/atari/search.h   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'frontends/atari')

diff --git a/frontends/atari/bitmap.h b/frontends/atari/bitmap.h
index b0fa18069..72bad555e 100644
--- a/frontends/atari/bitmap.h
+++ b/frontends/atari/bitmap.h
@@ -54,7 +54,7 @@
 */
 #define MFDB_SIZE( bpp, stride, h ) ( ((stride >> 3) * h) * bpp )
 
-struct gui_bitmap_table *atari_bitmap_table;
+extern struct gui_bitmap_table *atari_bitmap_table;
 
 struct bitmap {
 	int width;
diff --git a/frontends/atari/encoding.h b/frontends/atari/encoding.h
index 784aa8273..53db7b78b 100644
--- a/frontends/atari/encoding.h
+++ b/frontends/atari/encoding.h
@@ -25,7 +25,7 @@
 
 #include "utils/utf8.h"
 
-struct gui_utf8_table *atari_utf8_table;
+extern struct gui_utf8_table *atari_utf8_table;
 
 nserror utf8_to_local_encoding(const char *string, size_t len, char **result);
 nserror utf8_from_local_encoding(const char *string, size_t len, char **result);
diff --git a/frontends/atari/file.h b/frontends/atari/file.h
index b368567c7..3e568834b 100644
--- a/frontends/atari/file.h
+++ b/frontends/atari/file.h
@@ -21,7 +21,7 @@
 
 #include "utils/file.h"
 
-struct gui_file_table *atari_file_table;
+extern struct gui_file_table *atari_file_table;
 
 
 #endif /* FILE_C_INCLUDED */
diff --git a/frontends/atari/font.h b/frontends/atari/font.h
index a01d000c0..c0eb99dcd 100644
--- a/frontends/atari/font.h
+++ b/frontends/atari/font.h
@@ -19,7 +19,7 @@
 #ifndef NS_ATARI_FONT_H
 #define NS_ATARI_FONT_H
 
-struct gui_layout_table *atari_layout_table;
+extern struct gui_layout_table *atari_layout_table;
 
 #endif /* NETSURF_FB_FONT_H */
 
diff --git a/frontends/atari/search.h b/frontends/atari/search.h
index 04dfed4eb..adac62652 100644
--- a/frontends/atari/search.h
+++ b/frontends/atari/search.h
@@ -43,7 +43,7 @@ typedef struct s_search_form_session * SEARCH_FORM_SESSION;
 struct s_search_form_session * nsatari_search_session_create(OBJECT * obj,
 		struct gui_window *gw);
 
-struct gui_search_table *atari_search_table;
+extern struct gui_search_table *atari_search_table;
 
 void nsatari_search_session_destroy(struct s_search_form_session *s);
 void nsatari_search_perform(struct s_search_form_session *s, OBJECT *obj,
-- 
cgit v1.2.3