foxygit / doom Log in
commit 681783578112d3cd48bd69fa0b5aee7b74a2581c
Author:     Turo Lamminen <turol@iki.fi>
AuthorDate: Wed Sep 7 13:42:54 2022 +0300
Commit:     Turo Lamminen <turol@iki.fi>
CommitDate: Tue Sep 27 14:04:16 2022 +0300

    wad: Move wad_file_class_t extern declarations to w_file.h
---
 src/w_file.c       |  9 ---------
 src/w_file.h       | 12 ++++++++++++
 src/w_file_posix.c |  1 -
 src/w_file_stdc.c  |  1 -
 src/w_file_win32.c |  1 -
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/w_file.c b/src/w_file.c
index fd64d10e..87fc2c95 100644
--- a/src/w_file.c
+++ b/src/w_file.c
@@ -25,15 +25,6 @@

 #include "w_file.h"

-extern wad_file_class_t stdc_wad_file;
-
-#ifdef _WIN32
-extern wad_file_class_t win32_wad_file;
-#endif
-
-#ifdef HAVE_MMAP
-extern wad_file_class_t posix_wad_file;
-#endif

 static wad_file_class_t *wad_file_classes[] =
 {
diff --git a/src/w_file.h b/src/w_file.h
index e31ceaf0..be8065cc 100644
--- a/src/w_file.h
+++ b/src/w_file.h
@@ -39,6 +39,18 @@ typedef struct
                    void *buffer, size_t buffer_len);
 } wad_file_class_t;

+
+extern wad_file_class_t stdc_wad_file;
+
+#ifdef _WIN32
+extern wad_file_class_t win32_wad_file;
+#endif
+
+#ifdef HAVE_MMAP
+extern wad_file_class_t posix_wad_file;
+#endif
+
+
 struct _wad_file_s
 {
     // Class of this file.
diff --git a/src/w_file_posix.c b/src/w_file_posix.c
index d9835f4d..d4fdc22f 100644
--- a/src/w_file_posix.c
+++ b/src/w_file_posix.c
@@ -36,7 +36,6 @@ typedef struct
     int handle;
 } posix_wad_file_t;

-extern wad_file_class_t posix_wad_file;

 static void MapFile(posix_wad_file_t *wad, const char *filename)
 {
diff --git a/src/w_file_stdc.c b/src/w_file_stdc.c
index 2bb32de4..90846a4e 100644
--- a/src/w_file_stdc.c
+++ b/src/w_file_stdc.c
@@ -28,7 +28,6 @@ typedef struct
     FILE *fstream;
 } stdc_wad_file_t;

-extern wad_file_class_t stdc_wad_file;

 static wad_file_t *W_StdC_OpenFile(const char *path)
 {
diff --git a/src/w_file_win32.c b/src/w_file_win32.c
index d4cb7435..332be17b 100644
--- a/src/w_file_win32.c
+++ b/src/w_file_win32.c
@@ -43,7 +43,6 @@ typedef struct
     HANDLE handle_map;
 } win32_wad_file_t;

-extern wad_file_class_t win32_wad_file;

 static void MapFile(win32_wad_file_t *wad, const char *filename)
 {