Commit ee56090d3d57f25d8d7cbd68282ce3fbb9184492
2020-10-05T15:03:44
url: Cleanups and compiler warning fixes.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160
diff --git a/src/misc/SDL_sysurl.h b/src/misc/SDL_sysurl.h
new file mode 100644
index 0000000..d10e027
--- /dev/null
+++ b/src/misc/SDL_sysurl.h
@@ -0,0 +1,36 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../SDL_internal.h"
+#include "SDL_misc.h"
+#include "SDL_error.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int SDL_SYS_OpenURL(const char *url);
+
+#ifdef __cplusplus
+}
+#endif
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/misc/SDL_url.c b/src/misc/SDL_url.c
index 6fcda8f..fe60766 100644
--- a/src/misc/SDL_url.c
+++ b/src/misc/SDL_url.c
@@ -19,11 +19,9 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#include "../SDL_internal.h"
-#include "SDL_misc.h"
-#include "SDL_error.h"
+#include "SDL_sysurl.h"
-int SDL_SYS_OpenURL(const char *url);
+extern int SDL_SYS_OpenURL(const char *url);
int
SDL_OpenURL(const char *url)
diff --git a/src/misc/android/SDL_sysurl.c b/src/misc/android/SDL_sysurl.c
index c7f1d2a..37ea689 100644
--- a/src/misc/android/SDL_sysurl.c
+++ b/src/misc/android/SDL_sysurl.c
@@ -19,7 +19,7 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#include "../../SDL_internal.h"
+#include "../SDL_sysurl.h"
#include "../../core/android/SDL_android.h"
int
diff --git a/src/misc/dummy/SDL_sysurl.c b/src/misc/dummy/SDL_sysurl.c
index 9d3b67a..201f56b 100644
--- a/src/misc/dummy/SDL_sysurl.c
+++ b/src/misc/dummy/SDL_sysurl.c
@@ -19,8 +19,7 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#include "../../SDL_internal.h"
-#include "SDL_error.h"
+#include "../SDL_sysurl.h"
int
SDL_SYS_OpenURL(const char *url)
diff --git a/src/misc/haiku/SDL_sysurl.cc b/src/misc/haiku/SDL_sysurl.cc
index 72039a8..cd0df1c 100644
--- a/src/misc/haiku/SDL_sysurl.cc
+++ b/src/misc/haiku/SDL_sysurl.cc
@@ -19,12 +19,9 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#include "../../SDL_internal.h"
-#include "SDL_error.h"
+#include "../SDL_sysurl.h"
#include <Url.h>
-extern "C" { int SDL_SYS_OpenURL(const char *url); }
-
int
SDL_SYS_OpenURL(const char *url)
{
diff --git a/src/misc/ios/SDL_sysurl.m b/src/misc/ios/SDL_sysurl.m
index 73b9fee..44111a8 100644
--- a/src/misc/ios/SDL_sysurl.m
+++ b/src/misc/ios/SDL_sysurl.m
@@ -19,7 +19,7 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#include "../../SDL_internal.h"
+#include "../SDL_sysurl.h"
int
SDL_SYS_OpenURL(const char *url)
diff --git a/src/misc/macosx/SDL_sysurl.m b/src/misc/macosx/SDL_sysurl.m
index 80247f3..c896d99 100644
--- a/src/misc/macosx/SDL_sysurl.m
+++ b/src/misc/macosx/SDL_sysurl.m
@@ -19,7 +19,7 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#include "../../SDL_internal.h"
+#include "../SDL_sysurl.h"
#import <Cocoa/Cocoa.h>
diff --git a/src/misc/unix/SDL_sysurl.c b/src/misc/unix/SDL_sysurl.c
index df00e93..1fb7f32 100644
--- a/src/misc/unix/SDL_sysurl.c
+++ b/src/misc/unix/SDL_sysurl.c
@@ -19,8 +19,7 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#include "../../SDL_internal.h"
-#include "SDL_error.h"
+#include "../SDL_sysurl.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/misc/windows/SDL_sysurl.c b/src/misc/windows/SDL_sysurl.c
index ad77b77..33eefa1 100644
--- a/src/misc/windows/SDL_sysurl.c
+++ b/src/misc/windows/SDL_sysurl.c
@@ -19,9 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#include "../../SDL_internal.h"
+#include "../SDL_sysurl.h"
#include "../../core/windows/SDL_windows.h"
-#include "SDL_error.h"
#include <shellapi.h>