changeset 362:12367bfc2df6

misc: even more warnings cleaned
author David Demelier <markand@malikania.fr>
date Fri, 22 Oct 2021 14:40:03 +0200
parents 39f5d932941a
children c74ab1bbedec
files CMakeLists.txt src/libmlk-core-js/core/js-trace.c src/libmlk-core/core/sound.c src/libmlk-core/core/texture.c src/libmlk-core/core/zfile.c src/libmlk-port/port/fmemopen.c
diffstat 6 files changed, 24 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Fri Oct 22 14:26:41 2021 +0200
+++ b/CMakeLists.txt	Fri Oct 22 14:40:03 2021 +0200
@@ -33,7 +33,8 @@
 		set(CMAKE_C_FLAGS "-Wno-format-truncation ${CMAKE_C_FLAGS}")
 	endif ()
 elseif (CMAKE_C_COMPILER_ID MATCHES "MSVC")
-	set(CMAKE_C_FLAGS "/wd4090 /wd5105 /wd6031 /wd6001 /wd26451 ${CMAKE_C_FLAGS}")
+	set(CMAKE_C_FLAGS "/W3 /wd4090 /wd4244 /wd4267 /wd4996 /wd5105 /wd6031 /wd6001 /wd26451 ${CMAKE_C_FLAGS}")
+	set(CMAKE_C_FLAGS "/D_CRT_SECURE_NO_WARNINGS ${CMAKE_C_FLAGS}")
 endif ()
 
 if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
--- a/src/libmlk-core-js/core/js-trace.c	Fri Oct 22 14:26:41 2021 +0200
+++ b/src/libmlk-core-js/core/js-trace.c	Fri Oct 22 14:40:03 2021 +0200
@@ -1,19 +1,19 @@
-/*
- * js-trace.c -- core trace binding
- *
- * Copyright (c) 2020-2021 David Demelier <markand@malikania.fr>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+/*
+ * js-trace.c -- core trace binding
+ *
+ * Copyright (c) 2020-2021 David Demelier <markand@malikania.fr>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <assert.h>
--- a/src/libmlk-core/core/sound.c	Fri Oct 22 14:26:41 2021 +0200
+++ b/src/libmlk-core/core/sound.c	Fri Oct 22 14:40:03 2021 +0200
@@ -18,6 +18,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <string.h>
 
 #include <SDL_mixer.h>
 
--- a/src/libmlk-core/core/texture.c	Fri Oct 22 14:26:41 2021 +0200
+++ b/src/libmlk-core/core/texture.c	Fri Oct 22 14:40:03 2021 +0200
@@ -17,6 +17,7 @@
  */
 
 #include <assert.h>
+#include <string.h>
 
 #include "color.h"
 #include "error.h"
--- a/src/libmlk-core/core/zfile.c	Fri Oct 22 14:26:41 2021 +0200
+++ b/src/libmlk-core/core/zfile.c	Fri Oct 22 14:40:03 2021 +0200
@@ -26,7 +26,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if !defined(_WIN32)
+#if defined(_WIN32)
+#       include <io.h>
+#else
 #       include <unistd.h>
 #endif
 
--- a/src/libmlk-port/port/fmemopen.c	Fri Oct 22 14:26:41 2021 +0200
+++ b/src/libmlk-port/port/fmemopen.c	Fri Oct 22 14:40:03 2021 +0200
@@ -49,7 +49,7 @@
 		return NULL;
 	if ((fd = _sopen(temppath, flags, _SH_DENYRW, _S_IREAD | _S_IWRITE)) < 0)
 		return NULL;
-	if (!(fp = fdopen(fd, mode))) {
+	if (!(fp = _fdopen(fd, mode))) {
 		_close(fd);
 		return NULL;
 	}