Suppress warnings on Windows

norihiro · Jan 5, 2024 · 48b6b34 · 48b6b34
1 parent a283014
commit 48b6b34
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -80,6 +80,7 @@ if(OS_WINDOWS)
 	# Enable Multicore Builds and disable FH4 (to not depend on VCRUNTIME140_1.DLL when building with VS2019)
 	if (MSVC)
 		add_definitions(/MP /d2FH4-)
+		add_definitions("-D_CRT_SECURE_NO_WARNINGS") # for strncpy
 		add_definitions("-D_USE_MATH_DEFINES") # for M_PI
 	endif()
 

diff --git a/src/obs-vnc-source-main.c b/src/obs-vnc-source-main.c
@@ -70,7 +70,7 @@ static void vncsrc_update(void *data, obs_data_t *settings)
 		src->need_reconnect = true;
 	}
 
-	UPDATE_NOTIFY(src, int, host_port, need_reconnect, obs_data_get_int(settings, "host_port"));
+	UPDATE_NOTIFY(src, int, host_port, need_reconnect, (int)obs_data_get_int(settings, "host_port"));
 
 	const char *plain_passwd = obs_data_get_string(settings, "plain_passwd");
 	if (plain_passwd && (!src->config.plain_passwd || strcmp(plain_passwd, src->config.plain_passwd))) {
@@ -92,18 +92,18 @@ static void vncsrc_update(void *data, obs_data_t *settings)
 	}
 #endif // LIBVNCSERVER_HAVE_SASL
 
-	UPDATE_NOTIFY(src, int, bpp, need_reconnect, obs_data_get_int(settings, "bpp"));
-	UPDATE_NOTIFY(src, int, encodings, encoding_updated, obs_data_get_int(settings, "encodings"));
-	UPDATE_NOTIFY(src, int, compress, encoding_updated, obs_data_get_int(settings, "compress"));
+	UPDATE_NOTIFY(src, int, bpp, need_reconnect, (int)obs_data_get_int(settings, "bpp"));
+	UPDATE_NOTIFY(src, int, encodings, encoding_updated, (int)obs_data_get_int(settings, "encodings"));
+	UPDATE_NOTIFY(src, int, compress, encoding_updated, (int)obs_data_get_int(settings, "compress"));
 	UPDATE_NOTIFY(src, bool, jpeg, encoding_updated, obs_data_get_bool(settings, "jpeg"));
-	UPDATE_NOTIFY(src, int, quality, encoding_updated, obs_data_get_int(settings, "quality"));
-	UPDATE_NOTIFY(src, int, qosdscp, dscp_updated, obs_data_get_int(settings, "qosdscp"));
-	src->config.connect_opt = obs_data_get_int(settings, "connect_opt");
-
-	UPDATE_NOTIFY(src, int, skip_update_l, skip_updated, obs_data_get_int(settings, "skip_update_l"));
-	UPDATE_NOTIFY(src, int, skip_update_r, skip_updated, obs_data_get_int(settings, "skip_update_r"));
-	UPDATE_NOTIFY(src, int, skip_update_t, skip_updated, obs_data_get_int(settings, "skip_update_t"));
-	UPDATE_NOTIFY(src, int, skip_update_b, skip_updated, obs_data_get_int(settings, "skip_update_b"));
+	UPDATE_NOTIFY(src, int, quality, encoding_updated, (int)obs_data_get_int(settings, "quality"));
+	UPDATE_NOTIFY(src, int, qosdscp, dscp_updated, (int)obs_data_get_int(settings, "qosdscp"));
+	src->config.connect_opt = (int)obs_data_get_int(settings, "connect_opt");
+
+	UPDATE_NOTIFY(src, int, skip_update_l, skip_updated, (int)obs_data_get_int(settings, "skip_update_l"));
+	UPDATE_NOTIFY(src, int, skip_update_r, skip_updated, (int)obs_data_get_int(settings, "skip_update_r"));
+	UPDATE_NOTIFY(src, int, skip_update_t, skip_updated, (int)obs_data_get_int(settings, "skip_update_t"));
+	UPDATE_NOTIFY(src, int, skip_update_b, skip_updated, (int)obs_data_get_int(settings, "skip_update_b"));
 
 	pthread_mutex_unlock(&src->config_mutex);
 

diff --git a/src/obs-vnc-source-thread.c b/src/obs-vnc-source-thread.c
@@ -12,7 +12,10 @@
 #endif
 #include <errno.h>
 
+#ifndef WIN32
 #define WIN32
+#endif
+
 #endif // _WIN32
 
 #include <rfb/rfbclient.h>