Преглед изворни кода

Remove all defines for Symbian

Symbian is dead since 2014 - remove all defines
bel2125 пре 5 година
родитељ
комит
3bc6d9e7a5
3 измењених фајлова са 5 додато и 13 уклоњено
  1. 0 1
      resources/used_defines.txt
  2. 2 9
      src/civetweb.c
  3. 3 3
      src/main.c

+ 0 - 1
resources/used_defines.txt

@@ -97,7 +97,6 @@ __MINGW64__
 __STDC_FORMAT_MACROS
 __STDC_LIMIT_MACROS
 __STDC_VERSION__
-__SYMBIAN32__
 __clang__
 __clockid_t_defined
 __cplusplus

+ 2 - 9
src/civetweb.c

@@ -153,13 +153,9 @@ mg_static_assert(sizeof(void *) >= sizeof(int), "data type size check");
 #if defined(__SYMBIAN32__)
 /* According to https://en.wikipedia.org/wiki/Symbian#History,
  * Symbian is no longer maintained since 2014-01-01.
- * Recent versions of CivetWeb are no longer tested for Symbian.
- * It makes no sense, to support an abandoned operating system.
+ * Support for Symbian has been removed from CivetWeb
  */
 #error "Symbian is no longer maintained. CivetWeb no longer supports Symbian."
-#define NO_SSL /* SSL is not supported */
-#define NO_CGI /* CGI is not supported */
-#define PATH_MAX FILENAME_MAX
 #endif /* __SYMBIAN32__ */
 
 #if defined(__ZEPHYR__)
@@ -18740,7 +18736,6 @@ static void
 get_system_name(char **sysName)
 {
 #if defined(_WIN32)
-#if !defined(__SYMBIAN32__)
 #if defined(_WIN32_WCE)
 	*sysName = mg_strdup("WinCE");
 #else
@@ -18776,9 +18771,7 @@ get_system_name(char **sysName)
 
 	*sysName = mg_strdup(name);
 #endif
-#else
-	*sysName = mg_strdup("Symbian");
-#endif
+
 #elif defined(__ZEPHYR__)
 	*sysName = mg_strdup("Zephyr OS");
 #else

+ 3 - 3
src/main.c

@@ -90,7 +90,7 @@
 #define printf                                                                 \
 	DO_NOT_USE_THIS_FUNCTION__USE_fprintf /* Required for unit testing */
 
-#if defined(_WIN32) && !defined(__SYMBIAN32__) /* WINDOWS include block */
+#if defined(_WIN32) /* WINDOWS include block */
 #if !defined(_WIN32_WINNT)
 #define _WIN32_WINNT 0x0501 /* for tdm-gcc so we can use getconsolewindow */
 #endif
@@ -120,7 +120,7 @@ extern char *_getcwd(char *buf, size_t size);
 #define WINCDECL __cdecl
 #define abs_path(rel, abs, abs_size) (_fullpath((abs), (rel), (abs_size)))
 
-#else /* defined(_WIN32) && !defined(__SYMBIAN32__) - WINDOWS / UNIX include   \
+#else /* defined(_WIN32) - WINDOWS / UNIX include   \
          block */
 
 #include <sys/utsname.h>
@@ -131,7 +131,7 @@ extern char *_getcwd(char *buf, size_t size);
 #define WINCDECL
 #define abs_path(rel, abs, abs_size) (realpath((rel), (abs)))
 
-#endif /* defined(_WIN32) && !defined(__SYMBIAN32__) - WINDOWS / UNIX include  \
+#endif /* defined(_WIN32) - WINDOWS / UNIX include  \
           block */
 
 #if !defined(DEBUG_ASSERT)