geany-meson-win32.patch

diff --git a/meson.build b/meson.build
index ab1148cc..3d045976 100644
--- a/meson.build
+++ b/meson.build
@@ -32,11 +32,11 @@ def_cflags += '-DGEANY_DOCDIR="@0@"'.format(join_paths(prefix, get_option('datad
 geany_cflags = def_cflags
 have_gcc4_visibility = cc.has_argument('-fvisibility=hidden')
 geany_cflags += '-DGEANY_PRIVATE'
-if target_machine.system() == 'windows'
-  geany_cflags += '-DGEANY_EXPORT_SYMBOL="__declspec(dllexport)"'
-elif have_gcc4_visibility
+if have_gcc4_visibility
   geany_cflags += '-fvisibility=hidden'
   geany_cflags += '-DGEANY_EXPORT_SYMBOL=__attribute__((visibility("default")))'
+elif target_machine.system() == 'windows'
+  geany_cflags += '-DGEANY_EXPORT_SYMBOL=__declspec(dllexport)'
 endif
 geany_cflags += '-DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL'
 geany_cflags += '-DHAVE_REGCOMP' # Should always be 1, required for CTags.
@@ -502,9 +502,10 @@ subdir('data')
 subdir('plugins')
 
 sh = find_program('sh')
+if host_machine.system() != 'windows'
 extra_data = [['COPYING', 'GPL-2']]
-if host_machine.system() == 'windows'
-extra_data += [['AUTHORS', 'Authors.txt']]
+else
+extra_data = [['AUTHORS', 'Authors.txt']]
 extra_data += [['ChangeLog', 'Changelog.txt']]
 extra_data += [['COPYING', 'Copying.txt']]
 extra_data += [['README', 'Readme.txt']]
diff --git a/src/libmain.c b/src/libmain.c
index d397942f..6a71e19a 100644
--- a/src/libmain.c
+++ b/src/libmain.c
@@ -1178,6 +1178,7 @@ gint main_lib(gint argc, gchar **argv)
 		ui_set_statusbar(TRUE, message, g_strerror(config_dir_result));
 		g_warning(message, g_strerror(config_dir_result));
 	}
+#ifdef HAVE_SOCKET
 	if (socket_info.lock_socket == -1)
 	{
 		const gchar *message =
@@ -1185,6 +1186,7 @@ gint main_lib(gint argc, gchar **argv)
 		ui_set_statusbar(TRUE, "%s", message);
 		g_warning("%s", message);
 	}
+#endif
 
 	/* apply all configuration options */
 	apply_settings();