summaryrefslogtreecommitdiff
path: root/tests/objects
diff options
context:
space:
mode:
authorwszqkzqk <wszqkzqk@qq.com>2023-01-11 13:44:49 +0800
committerRico Tzschichholz <ricotz@ubuntu.com>2023-01-11 09:37:41 +0100
commit4bdb3e7301c59a32216ff383c23a4bdcf70fa268 (patch)
tree5c8133ec9d2ea9efddb39abc8223b416b96182eb /tests/objects
parent1b63836ba222440affcde4f3036c68f009dabc2c (diff)
downloadvala-4bdb3e7301c59a32216ff383c23a4bdcf70fa268.tar.gz
tests: Update c-expected
Diffstat (limited to 'tests/objects')
-rw-r--r--tests/objects/bug566909.c-expected2
-rw-r--r--tests/objects/bug588203.c-expected2
-rw-r--r--tests/objects/bug589928.c-expected2
-rw-r--r--tests/objects/bug593137.c-expected2
-rw-r--r--tests/objects/bug593260.c-expected2
-rw-r--r--tests/objects/bug596621.c-expected2
-rw-r--r--tests/objects/bug597155.c-expected2
-rw-r--r--tests/objects/bug597161.c-expected2
-rw-r--r--tests/objects/bug613486.c-expected2
-rw-r--r--tests/objects/bug620675.c-expected2
-rw-r--r--tests/objects/bug620706.c-expected2
-rw-r--r--tests/objects/bug624594.c-expected2
-rw-r--r--tests/objects/bug626038-2.c-expected2
-rw-r--r--tests/objects/bug626038.c-expected2
-rw-r--r--tests/objects/bug628639.c-expected2
-rw-r--r--tests/objects/bug629593.c-expected2
-rw-r--r--tests/objects/bug631267.c-expected2
-rw-r--r--tests/objects/bug634782.c-expected2
-rw-r--r--tests/objects/bug641828.c-expected2
-rw-r--r--tests/objects/bug642809.c-expected2
-rw-r--r--tests/objects/bug643711.c-expected2
-rw-r--r--tests/objects/bug644938.c-expected2
-rw-r--r--tests/objects/bug646362.c-expected2
-rw-r--r--tests/objects/bug646792.c-expected2
-rw-r--r--tests/objects/bug647018.c-expected2
-rw-r--r--tests/objects/bug653138.c-expected2
-rw-r--r--tests/objects/bug654702.c-expected2
-rw-r--r--tests/objects/bug663134.c-expected2
-rw-r--r--tests/objects/bug667668.c-expected2
-rw-r--r--tests/objects/bug681356.c-expected2
-rw-r--r--tests/objects/bug683646.c-expected2
-rw-r--r--tests/objects/bug695671.c-expected2
-rw-r--r--tests/objects/bug702736.c-expected2
-rw-r--r--tests/objects/bug731547.c-expected2
-rw-r--r--tests/objects/bug741465.c-expected2
-rw-r--r--tests/objects/bug751338.c-expected2
-rw-r--r--tests/objects/bug758816.c-expected2
-rw-r--r--tests/objects/bug764481.c-expected2
-rw-r--r--tests/objects/bug766739.c-expected2
-rw-r--r--tests/objects/bug778632.c-expected2
-rw-r--r--tests/objects/bug779219.c-expected2
-rw-r--r--tests/objects/bug779955.c-expected2
-rw-r--r--tests/objects/bug783897.c-expected2
-rw-r--r--tests/objects/bug788964.c-expected2
-rw-r--r--tests/objects/bug795521.c-expected2
-rw-r--r--tests/objects/chainup.c-expected2
-rw-r--r--tests/objects/class-ccode-cprefix.c-expected2
-rw-r--r--tests/objects/class-destroysinstance.c-expected2
-rw-r--r--tests/objects/class-inner-types.c-expected2
-rw-r--r--tests/objects/class-new-no-override.c-expected2
-rw-r--r--tests/objects/class-partial-nested.c-expected2
-rw-r--r--tests/objects/class-partial.c-expected2
-rw-r--r--tests/objects/class-vfunc-base-access.c-expected2
-rw-r--r--tests/objects/class_only.c-expected2
-rw-r--r--tests/objects/classes-implicit-implementation.c-expected2
-rw-r--r--tests/objects/classes-interfaces-virtuals.c-expected2
-rw-r--r--tests/objects/classes-interfaces.c-expected2
-rw-r--r--tests/objects/classes.c-expected2
-rw-r--r--tests/objects/compact-class-custom-ref.c-expected2
-rw-r--r--tests/objects/compact-class-destructor.c-expected2
-rw-r--r--tests/objects/compact-class-refcount.c-expected2
-rw-r--r--tests/objects/compact-class.c-expected2
-rw-r--r--tests/objects/constructor-inner-error.c-expected2
-rw-r--r--tests/objects/constructor-variadic.c-expected2
-rw-r--r--tests/objects/constructors.c-expected2
-rw-r--r--tests/objects/destructors.c-expected2
-rw-r--r--tests/objects/dynamic.c-expected2
-rw-r--r--tests/objects/fields.c-expected2
-rw-r--r--tests/objects/gobject-class-lifetime.c-expected2
-rw-r--r--tests/objects/gsource.c-expected2
-rw-r--r--tests/objects/gtype-class-lifetime.c-expected2
-rw-r--r--tests/objects/initially-unowned.c-expected2
-rw-r--r--tests/objects/instance-comparison.c-expected2
-rw-r--r--tests/objects/interface-abstract-async-override.c-expected2
-rw-r--r--tests/objects/interface-async-base-access.c-expected2
-rw-r--r--tests/objects/interface-async-captured-generic.c-expected2
-rw-r--r--tests/objects/interface-base-access.c-expected2
-rw-r--r--tests/objects/interface-generics.c-expected2
-rw-r--r--tests/objects/interface-inner-types.c-expected2
-rw-r--r--tests/objects/interface-parameter-nowrapper.c-expected2
-rw-r--r--tests/objects/interface-property-base-access.c-expected2
-rw-r--r--tests/objects/interface-property-base-impl.c-expected2
-rw-r--r--tests/objects/interface-property-delegate.c-expected2
-rw-r--r--tests/objects/interface-property-override.c-expected2
-rw-r--r--tests/objects/interface-virtual-override.c-expected2
-rw-r--r--tests/objects/interface_only.c-expected2
-rw-r--r--tests/objects/interfaces.c-expected2
-rw-r--r--tests/objects/member-initializer-base-properties.c-expected2
-rw-r--r--tests/objects/member-initializer-chained-2.c-expected2
-rw-r--r--tests/objects/member-initializer-chained.c-expected2
-rw-r--r--tests/objects/member-initializer-private.c-expected2
-rw-r--r--tests/objects/member-initializer-property-owned-setter.c-expected2
-rw-r--r--tests/objects/member-initializer-property.c-expected2
-rw-r--r--tests/objects/member-initializer-protected.c-expected2
-rw-r--r--tests/objects/methods.c-expected2
-rw-r--r--tests/objects/paramspec.c-expected2
-rw-r--r--tests/objects/plugin-module-init.c-expected2
-rw-r--r--tests/objects/properties.c-expected2
-rw-r--r--tests/objects/property-array-length.c-expected2
-rw-r--r--tests/objects/property-array.c-expected2
-rw-r--r--tests/objects/property-base-access.c-expected2
-rw-r--r--tests/objects/property-construct-only.c-expected2
-rw-r--r--tests/objects/property-delegate-owned.c-expected2
-rw-r--r--tests/objects/property-delegate.c-expected2
-rw-r--r--tests/objects/property-dynamic-type-inference.c-expected2
-rw-r--r--tests/objects/property-enum-nullable.c-expected2
-rw-r--r--tests/objects/property-enum.c-expected2
-rw-r--r--tests/objects/property-gboxed-nullable.c-expected2
-rw-r--r--tests/objects/property-notify-owned-getter.c-expected2
-rw-r--r--tests/objects/property-notify.c-expected2
-rw-r--r--tests/objects/property-ownership.c-expected2
-rw-r--r--tests/objects/property-read-only-auto.c-expected2
-rw-r--r--tests/objects/property-real-struct-assignment.c-expected2
-rw-r--r--tests/objects/property-simple-type-struct-nullable.c-expected2
-rw-r--r--tests/objects/property-static.c-expected2
-rw-r--r--tests/objects/property-struct-no-gtype.c-expected2
-rw-r--r--tests/objects/property-strv-noaccessor.c-expected2
-rw-r--r--tests/objects/regex.c-expected2
-rw-r--r--tests/objects/signals-default-class-handler.c-expected2
-rw-r--r--tests/objects/signals-delegate-parameter.c-expected2
-rw-r--r--tests/objects/signals-delegate.c-expected2
-rw-r--r--tests/objects/signals-dynamic-emit.c-expected2
-rw-r--r--tests/objects/signals-emit.c-expected2
-rw-r--r--tests/objects/signals-enum-marshal.c-expected2
-rw-r--r--tests/objects/signals-error-marshal.c-expected2
-rw-r--r--tests/objects/signals-fundamental-return.c-expected2
-rw-r--r--tests/objects/signals-generic-return.c-expected2
-rw-r--r--tests/objects/signals-gobject-return.c-expected2
-rw-r--r--tests/objects/signals-lambda-delegate.c-expected2
-rw-r--r--tests/objects/signals-prototype-access.c-expected2
-rw-r--r--tests/objects/signals-struct-return.c-expected2
-rw-r--r--tests/objects/signals.c-expected2
-rw-r--r--tests/objects/simple-generics-chainup.c-expected2
-rw-r--r--tests/objects/singleton.c-expected2
-rw-r--r--tests/objects/test-025.c-expected2
-rw-r--r--tests/objects/test-026.c-expected2
-rw-r--r--tests/objects/test-029.c-expected2
-rw-r--r--tests/objects/test-034.c-expected2
-rw-r--r--tests/objects/type-narrowing-by-precondition.c-expected2
-rw-r--r--tests/objects/type-narrowing-fallback.c-expected2
-rw-r--r--tests/objects/type-narrowing.c-expected2
-rw-r--r--tests/objects/with-expression.c-expected2
-rw-r--r--tests/objects/with-instance.c-expected2
-rw-r--r--tests/objects/with-nested-in-lambda.c-expected2
-rw-r--r--tests/objects/with-nested-method.c-expected2
-rw-r--r--tests/objects/with-nested-signal.c-expected2
-rw-r--r--tests/objects/with-nested-unambigous-signal.c-expected2
-rw-r--r--tests/objects/with-nested.c-expected2
148 files changed, 148 insertions, 148 deletions
diff --git a/tests/objects/bug566909.c-expected b/tests/objects/bug566909.c-expected
index 05ada381f..7fd25eeb4 100644
--- a/tests/objects/bug566909.c-expected
+++ b/tests/objects/bug566909.c-expected
@@ -7,7 +7,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug588203.c-expected b/tests/objects/bug588203.c-expected
index 762390cd1..631dc3838 100644
--- a/tests/objects/bug588203.c-expected
+++ b/tests/objects/bug588203.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug589928.c-expected b/tests/objects/bug589928.c-expected
index 9dcde3e70..07d6107f5 100644
--- a/tests/objects/bug589928.c-expected
+++ b/tests/objects/bug589928.c-expected
@@ -8,7 +8,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug593137.c-expected b/tests/objects/bug593137.c-expected
index 287bc43fa..7811226bc 100644
--- a/tests/objects/bug593137.c-expected
+++ b/tests/objects/bug593137.c-expected
@@ -7,7 +7,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug593260.c-expected b/tests/objects/bug593260.c-expected
index a0b3fb9c8..cb23918e4 100644
--- a/tests/objects/bug593260.c-expected
+++ b/tests/objects/bug593260.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug596621.c-expected b/tests/objects/bug596621.c-expected
index 1beebed6c..4d0036c20 100644
--- a/tests/objects/bug596621.c-expected
+++ b/tests/objects/bug596621.c-expected
@@ -5,7 +5,7 @@
#include <glib-object.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug597155.c-expected b/tests/objects/bug597155.c-expected
index e1336728c..2546fb89e 100644
--- a/tests/objects/bug597155.c-expected
+++ b/tests/objects/bug597155.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug597161.c-expected b/tests/objects/bug597161.c-expected
index 958cbda3e..7b2e3ba08 100644
--- a/tests/objects/bug597161.c-expected
+++ b/tests/objects/bug597161.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug613486.c-expected b/tests/objects/bug613486.c-expected
index ce02c4d4a..fcbcefe1e 100644
--- a/tests/objects/bug613486.c-expected
+++ b/tests/objects/bug613486.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug620675.c-expected b/tests/objects/bug620675.c-expected
index 46dd1a3a0..276db37c4 100644
--- a/tests/objects/bug620675.c-expected
+++ b/tests/objects/bug620675.c-expected
@@ -9,7 +9,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug620706.c-expected b/tests/objects/bug620706.c-expected
index 7165a7b62..8b6c36a84 100644
--- a/tests/objects/bug620706.c-expected
+++ b/tests/objects/bug620706.c-expected
@@ -6,7 +6,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug624594.c-expected b/tests/objects/bug624594.c-expected
index ee199a553..76ebc5460 100644
--- a/tests/objects/bug624594.c-expected
+++ b/tests/objects/bug624594.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug626038-2.c-expected b/tests/objects/bug626038-2.c-expected
index 9c4f767bf..8a348544e 100644
--- a/tests/objects/bug626038-2.c-expected
+++ b/tests/objects/bug626038-2.c-expected
@@ -8,7 +8,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug626038.c-expected b/tests/objects/bug626038.c-expected
index 994cb86ac..29d64fd16 100644
--- a/tests/objects/bug626038.c-expected
+++ b/tests/objects/bug626038.c-expected
@@ -5,7 +5,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug628639.c-expected b/tests/objects/bug628639.c-expected
index 71864fa2e..4a1d3973d 100644
--- a/tests/objects/bug628639.c-expected
+++ b/tests/objects/bug628639.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug629593.c-expected b/tests/objects/bug629593.c-expected
index 4f4814f01..83ffffce3 100644
--- a/tests/objects/bug629593.c-expected
+++ b/tests/objects/bug629593.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug631267.c-expected b/tests/objects/bug631267.c-expected
index 7f39c30d0..2b8a186f0 100644
--- a/tests/objects/bug631267.c-expected
+++ b/tests/objects/bug631267.c-expected
@@ -7,7 +7,7 @@
#include <stdlib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug634782.c-expected b/tests/objects/bug634782.c-expected
index 9aaf333e7..a5dc27c12 100644
--- a/tests/objects/bug634782.c-expected
+++ b/tests/objects/bug634782.c-expected
@@ -7,7 +7,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug641828.c-expected b/tests/objects/bug641828.c-expected
index 9ce869b9c..999d21efb 100644
--- a/tests/objects/bug641828.c-expected
+++ b/tests/objects/bug641828.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug642809.c-expected b/tests/objects/bug642809.c-expected
index 01a879244..ccbbaa1c9 100644
--- a/tests/objects/bug642809.c-expected
+++ b/tests/objects/bug642809.c-expected
@@ -4,7 +4,7 @@
#include <glib-object.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug643711.c-expected b/tests/objects/bug643711.c-expected
index c6f609155..898681ffe 100644
--- a/tests/objects/bug643711.c-expected
+++ b/tests/objects/bug643711.c-expected
@@ -7,7 +7,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug644938.c-expected b/tests/objects/bug644938.c-expected
index cc264a45b..16c8e7077 100644
--- a/tests/objects/bug644938.c-expected
+++ b/tests/objects/bug644938.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug646362.c-expected b/tests/objects/bug646362.c-expected
index ebe50de6b..092d33f38 100644
--- a/tests/objects/bug646362.c-expected
+++ b/tests/objects/bug646362.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug646792.c-expected b/tests/objects/bug646792.c-expected
index a2d9bfcec..48c5f648a 100644
--- a/tests/objects/bug646792.c-expected
+++ b/tests/objects/bug646792.c-expected
@@ -8,7 +8,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug647018.c-expected b/tests/objects/bug647018.c-expected
index 5ddb3f216..492cc66b2 100644
--- a/tests/objects/bug647018.c-expected
+++ b/tests/objects/bug647018.c-expected
@@ -6,7 +6,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug653138.c-expected b/tests/objects/bug653138.c-expected
index eaef9d195..6b0a70e33 100644
--- a/tests/objects/bug653138.c-expected
+++ b/tests/objects/bug653138.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug654702.c-expected b/tests/objects/bug654702.c-expected
index 0d0b8a430..2089ac285 100644
--- a/tests/objects/bug654702.c-expected
+++ b/tests/objects/bug654702.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug663134.c-expected b/tests/objects/bug663134.c-expected
index 945de99f5..3b1064b6f 100644
--- a/tests/objects/bug663134.c-expected
+++ b/tests/objects/bug663134.c-expected
@@ -8,7 +8,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug667668.c-expected b/tests/objects/bug667668.c-expected
index dc7a7e538..643616b28 100644
--- a/tests/objects/bug667668.c-expected
+++ b/tests/objects/bug667668.c-expected
@@ -7,7 +7,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug681356.c-expected b/tests/objects/bug681356.c-expected
index 82fff780e..ccb27ea62 100644
--- a/tests/objects/bug681356.c-expected
+++ b/tests/objects/bug681356.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug683646.c-expected b/tests/objects/bug683646.c-expected
index 97f2b21a2..29dee3f92 100644
--- a/tests/objects/bug683646.c-expected
+++ b/tests/objects/bug683646.c-expected
@@ -5,7 +5,7 @@
#include <glib-object.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug695671.c-expected b/tests/objects/bug695671.c-expected
index bd8cf1295..77f62969a 100644
--- a/tests/objects/bug695671.c-expected
+++ b/tests/objects/bug695671.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug702736.c-expected b/tests/objects/bug702736.c-expected
index 320686b7a..7824b8436 100644
--- a/tests/objects/bug702736.c-expected
+++ b/tests/objects/bug702736.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug731547.c-expected b/tests/objects/bug731547.c-expected
index 51d6391aa..3b0278520 100644
--- a/tests/objects/bug731547.c-expected
+++ b/tests/objects/bug731547.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug741465.c-expected b/tests/objects/bug741465.c-expected
index 65e83ec69..45a70c9de 100644
--- a/tests/objects/bug741465.c-expected
+++ b/tests/objects/bug741465.c-expected
@@ -6,7 +6,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug751338.c-expected b/tests/objects/bug751338.c-expected
index b03bc708b..6e9fb522e 100644
--- a/tests/objects/bug751338.c-expected
+++ b/tests/objects/bug751338.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug758816.c-expected b/tests/objects/bug758816.c-expected
index c22e44636..024b59f6d 100644
--- a/tests/objects/bug758816.c-expected
+++ b/tests/objects/bug758816.c-expected
@@ -6,7 +6,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug764481.c-expected b/tests/objects/bug764481.c-expected
index ea66bcc77..016092893 100644
--- a/tests/objects/bug764481.c-expected
+++ b/tests/objects/bug764481.c-expected
@@ -6,7 +6,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug766739.c-expected b/tests/objects/bug766739.c-expected
index 17f4adb52..7c250d645 100644
--- a/tests/objects/bug766739.c-expected
+++ b/tests/objects/bug766739.c-expected
@@ -8,7 +8,7 @@
#include <stdlib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug778632.c-expected b/tests/objects/bug778632.c-expected
index ef8387d12..ac1c13f1a 100644
--- a/tests/objects/bug778632.c-expected
+++ b/tests/objects/bug778632.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug779219.c-expected b/tests/objects/bug779219.c-expected
index 53fcd2158..30eb64ca4 100644
--- a/tests/objects/bug779219.c-expected
+++ b/tests/objects/bug779219.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug779955.c-expected b/tests/objects/bug779955.c-expected
index 43451cbc9..d0cc96029 100644
--- a/tests/objects/bug779955.c-expected
+++ b/tests/objects/bug779955.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug783897.c-expected b/tests/objects/bug783897.c-expected
index 389f3a547..ef949cb38 100644
--- a/tests/objects/bug783897.c-expected
+++ b/tests/objects/bug783897.c-expected
@@ -7,7 +7,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug788964.c-expected b/tests/objects/bug788964.c-expected
index 2f2cca4ba..37d26c7c4 100644
--- a/tests/objects/bug788964.c-expected
+++ b/tests/objects/bug788964.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/bug795521.c-expected b/tests/objects/bug795521.c-expected
index 07a627494..a833b76fe 100644
--- a/tests/objects/bug795521.c-expected
+++ b/tests/objects/bug795521.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/chainup.c-expected b/tests/objects/chainup.c-expected
index a3d35c3ef..844a27cc6 100644
--- a/tests/objects/chainup.c-expected
+++ b/tests/objects/chainup.c-expected
@@ -7,7 +7,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/class-ccode-cprefix.c-expected b/tests/objects/class-ccode-cprefix.c-expected
index e2dbcc440..188e7d7cb 100644
--- a/tests/objects/class-ccode-cprefix.c-expected
+++ b/tests/objects/class-ccode-cprefix.c-expected
@@ -5,7 +5,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/class-destroysinstance.c-expected b/tests/objects/class-destroysinstance.c-expected
index 4f52cd7f7..f7ce00582 100644
--- a/tests/objects/class-destroysinstance.c-expected
+++ b/tests/objects/class-destroysinstance.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/class-inner-types.c-expected b/tests/objects/class-inner-types.c-expected
index 110ad6abb..1e994733d 100644
--- a/tests/objects/class-inner-types.c-expected
+++ b/tests/objects/class-inner-types.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/class-new-no-override.c-expected b/tests/objects/class-new-no-override.c-expected
index 6d9dec170..f60cdd330 100644
--- a/tests/objects/class-new-no-override.c-expected
+++ b/tests/objects/class-new-no-override.c-expected
@@ -7,7 +7,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/class-partial-nested.c-expected b/tests/objects/class-partial-nested.c-expected
index c0ddeafd9..34adbfbb3 100644
--- a/tests/objects/class-partial-nested.c-expected
+++ b/tests/objects/class-partial-nested.c-expected
@@ -8,7 +8,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/class-partial.c-expected b/tests/objects/class-partial.c-expected
index 0b9f77d2f..923878efc 100644
--- a/tests/objects/class-partial.c-expected
+++ b/tests/objects/class-partial.c-expected
@@ -7,7 +7,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/class-vfunc-base-access.c-expected b/tests/objects/class-vfunc-base-access.c-expected
index 2ad5c9cdf..5da4dfea1 100644
--- a/tests/objects/class-vfunc-base-access.c-expected
+++ b/tests/objects/class-vfunc-base-access.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/class_only.c-expected b/tests/objects/class_only.c-expected
index b4e6d87cc..1f777d636 100644
--- a/tests/objects/class_only.c-expected
+++ b/tests/objects/class_only.c-expected
@@ -5,7 +5,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/classes-implicit-implementation.c-expected b/tests/objects/classes-implicit-implementation.c-expected
index 3008fbc01..32c92f027 100644
--- a/tests/objects/classes-implicit-implementation.c-expected
+++ b/tests/objects/classes-implicit-implementation.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/classes-interfaces-virtuals.c-expected b/tests/objects/classes-interfaces-virtuals.c-expected
index a770c2b32..1547c4363 100644
--- a/tests/objects/classes-interfaces-virtuals.c-expected
+++ b/tests/objects/classes-interfaces-virtuals.c-expected
@@ -7,7 +7,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/classes-interfaces.c-expected b/tests/objects/classes-interfaces.c-expected
index fce71f4e7..17154d3ca 100644
--- a/tests/objects/classes-interfaces.c-expected
+++ b/tests/objects/classes-interfaces.c-expected
@@ -7,7 +7,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/classes.c-expected b/tests/objects/classes.c-expected
index afe167367..762cee180 100644
--- a/tests/objects/classes.c-expected
+++ b/tests/objects/classes.c-expected
@@ -7,7 +7,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/compact-class-custom-ref.c-expected b/tests/objects/compact-class-custom-ref.c-expected
index 7d15c46c7..b88bbb0c9 100644
--- a/tests/objects/compact-class-custom-ref.c-expected
+++ b/tests/objects/compact-class-custom-ref.c-expected
@@ -4,7 +4,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/compact-class-destructor.c-expected b/tests/objects/compact-class-destructor.c-expected
index 7214f19d8..b55d1dc93 100644
--- a/tests/objects/compact-class-destructor.c-expected
+++ b/tests/objects/compact-class-destructor.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/compact-class-refcount.c-expected b/tests/objects/compact-class-refcount.c-expected
index 1d0cf67ee..bf1db6ba9 100644
--- a/tests/objects/compact-class-refcount.c-expected
+++ b/tests/objects/compact-class-refcount.c-expected
@@ -4,7 +4,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/compact-class.c-expected b/tests/objects/compact-class.c-expected
index 4a2ab95f9..b0be6b630 100644
--- a/tests/objects/compact-class.c-expected
+++ b/tests/objects/compact-class.c-expected
@@ -4,7 +4,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/constructor-inner-error.c-expected b/tests/objects/constructor-inner-error.c-expected
index 702c79511..59223beab 100644
--- a/tests/objects/constructor-inner-error.c-expected
+++ b/tests/objects/constructor-inner-error.c-expected
@@ -5,7 +5,7 @@
#include <glib-object.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/constructor-variadic.c-expected b/tests/objects/constructor-variadic.c-expected
index 522fb8325..5855a25d8 100644
--- a/tests/objects/constructor-variadic.c-expected
+++ b/tests/objects/constructor-variadic.c-expected
@@ -9,7 +9,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/constructors.c-expected b/tests/objects/constructors.c-expected
index a928d36fa..a0e0a395c 100644
--- a/tests/objects/constructors.c-expected
+++ b/tests/objects/constructors.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/destructors.c-expected b/tests/objects/destructors.c-expected
index a3e969bef..e258caacb 100644
--- a/tests/objects/destructors.c-expected
+++ b/tests/objects/destructors.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/dynamic.c-expected b/tests/objects/dynamic.c-expected
index c1a3aed50..ddd7b7f1f 100644
--- a/tests/objects/dynamic.c-expected
+++ b/tests/objects/dynamic.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/fields.c-expected b/tests/objects/fields.c-expected
index c0fdf2f7c..6ff2d76f3 100644
--- a/tests/objects/fields.c-expected
+++ b/tests/objects/fields.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/gobject-class-lifetime.c-expected b/tests/objects/gobject-class-lifetime.c-expected
index d2c971e12..01412f9b2 100644
--- a/tests/objects/gobject-class-lifetime.c-expected
+++ b/tests/objects/gobject-class-lifetime.c-expected
@@ -5,7 +5,7 @@
#include <glib-object.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/gsource.c-expected b/tests/objects/gsource.c-expected
index 3413e0726..3d288f232 100644
--- a/tests/objects/gsource.c-expected
+++ b/tests/objects/gsource.c-expected
@@ -4,7 +4,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/gtype-class-lifetime.c-expected b/tests/objects/gtype-class-lifetime.c-expected
index ce13f2e20..fe0a7a2c0 100644
--- a/tests/objects/gtype-class-lifetime.c-expected
+++ b/tests/objects/gtype-class-lifetime.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/initially-unowned.c-expected b/tests/objects/initially-unowned.c-expected
index 3cc673fc0..269486015 100644
--- a/tests/objects/initially-unowned.c-expected
+++ b/tests/objects/initially-unowned.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/instance-comparison.c-expected b/tests/objects/instance-comparison.c-expected
index 811918076..3dc323a56 100644
--- a/tests/objects/instance-comparison.c-expected
+++ b/tests/objects/instance-comparison.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interface-abstract-async-override.c-expected b/tests/objects/interface-abstract-async-override.c-expected
index 494585889..874a09f7c 100644
--- a/tests/objects/interface-abstract-async-override.c-expected
+++ b/tests/objects/interface-abstract-async-override.c-expected
@@ -6,7 +6,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interface-async-base-access.c-expected b/tests/objects/interface-async-base-access.c-expected
index a84c03a39..c98c755dd 100644
--- a/tests/objects/interface-async-base-access.c-expected
+++ b/tests/objects/interface-async-base-access.c-expected
@@ -7,7 +7,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interface-async-captured-generic.c-expected b/tests/objects/interface-async-captured-generic.c-expected
index 985de3f66..ed43ffed9 100644
--- a/tests/objects/interface-async-captured-generic.c-expected
+++ b/tests/objects/interface-async-captured-generic.c-expected
@@ -8,7 +8,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interface-base-access.c-expected b/tests/objects/interface-base-access.c-expected
index 185c70f2d..e124950ce 100644
--- a/tests/objects/interface-base-access.c-expected
+++ b/tests/objects/interface-base-access.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interface-generics.c-expected b/tests/objects/interface-generics.c-expected
index d6cd58a21..eb5521a60 100644
--- a/tests/objects/interface-generics.c-expected
+++ b/tests/objects/interface-generics.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interface-inner-types.c-expected b/tests/objects/interface-inner-types.c-expected
index cb7386ab2..71154f965 100644
--- a/tests/objects/interface-inner-types.c-expected
+++ b/tests/objects/interface-inner-types.c-expected
@@ -6,7 +6,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interface-parameter-nowrapper.c-expected b/tests/objects/interface-parameter-nowrapper.c-expected
index 289a96156..b8df1203c 100644
--- a/tests/objects/interface-parameter-nowrapper.c-expected
+++ b/tests/objects/interface-parameter-nowrapper.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interface-property-base-access.c-expected b/tests/objects/interface-property-base-access.c-expected
index 5a7189076..4f38491e2 100644
--- a/tests/objects/interface-property-base-access.c-expected
+++ b/tests/objects/interface-property-base-access.c-expected
@@ -8,7 +8,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interface-property-base-impl.c-expected b/tests/objects/interface-property-base-impl.c-expected
index 021cce647..0af791e62 100644
--- a/tests/objects/interface-property-base-impl.c-expected
+++ b/tests/objects/interface-property-base-impl.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interface-property-delegate.c-expected b/tests/objects/interface-property-delegate.c-expected
index 919b29c94..7e18b28e1 100644
--- a/tests/objects/interface-property-delegate.c-expected
+++ b/tests/objects/interface-property-delegate.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interface-property-override.c-expected b/tests/objects/interface-property-override.c-expected
index 8e10b48d8..633b0d296 100644
--- a/tests/objects/interface-property-override.c-expected
+++ b/tests/objects/interface-property-override.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interface-virtual-override.c-expected b/tests/objects/interface-virtual-override.c-expected
index 5181438c1..fb9665f45 100644
--- a/tests/objects/interface-virtual-override.c-expected
+++ b/tests/objects/interface-virtual-override.c-expected
@@ -6,7 +6,7 @@
#include <gio/gio.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interface_only.c-expected b/tests/objects/interface_only.c-expected
index ee32d2c56..e67b39b27 100644
--- a/tests/objects/interface_only.c-expected
+++ b/tests/objects/interface_only.c-expected
@@ -4,7 +4,7 @@
#include <glib-object.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/interfaces.c-expected b/tests/objects/interfaces.c-expected
index f5762fce1..e883589be 100644
--- a/tests/objects/interfaces.c-expected
+++ b/tests/objects/interfaces.c-expected
@@ -6,7 +6,7 @@
#include <stdio.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/member-initializer-base-properties.c-expected b/tests/objects/member-initializer-base-properties.c-expected
index 859afae4a..7e9e769c4 100644
--- a/tests/objects/member-initializer-base-properties.c-expected
+++ b/tests/objects/member-initializer-base-properties.c-expected
@@ -8,7 +8,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/member-initializer-chained-2.c-expected b/tests/objects/member-initializer-chained-2.c-expected
index 6ea0aad0c..99abbb5f9 100644
--- a/tests/objects/member-initializer-chained-2.c-expected
+++ b/tests/objects/member-initializer-chained-2.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/member-initializer-chained.c-expected b/tests/objects/member-initializer-chained.c-expected
index 1ea6a71a5..7ad26b363 100644
--- a/tests/objects/member-initializer-chained.c-expected
+++ b/tests/objects/member-initializer-chained.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/member-initializer-private.c-expected b/tests/objects/member-initializer-private.c-expected
index 9027b52e5..d4822129e 100644
--- a/tests/objects/member-initializer-private.c-expected
+++ b/tests/objects/member-initializer-private.c-expected
@@ -8,7 +8,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/member-initializer-property-owned-setter.c-expected b/tests/objects/member-initializer-property-owned-setter.c-expected
index 94e126c4b..b42a744be 100644
--- a/tests/objects/member-initializer-property-owned-setter.c-expected
+++ b/tests/objects/member-initializer-property-owned-setter.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/member-initializer-property.c-expected b/tests/objects/member-initializer-property.c-expected
index 8cdaf3e4e..5cf74101f 100644
--- a/tests/objects/member-initializer-property.c-expected
+++ b/tests/objects/member-initializer-property.c-expected
@@ -6,7 +6,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/member-initializer-protected.c-expected b/tests/objects/member-initializer-protected.c-expected
index 951bb1b0f..33d600b95 100644
--- a/tests/objects/member-initializer-protected.c-expected
+++ b/tests/objects/member-initializer-protected.c-expected
@@ -8,7 +8,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/methods.c-expected b/tests/objects/methods.c-expected
index 38321f5cb..2f2c9518a 100644
--- a/tests/objects/methods.c-expected
+++ b/tests/objects/methods.c-expected
@@ -9,7 +9,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/paramspec.c-expected b/tests/objects/paramspec.c-expected
index da4999822..b1c871346 100644
--- a/tests/objects/paramspec.c-expected
+++ b/tests/objects/paramspec.c-expected
@@ -8,7 +8,7 @@
#include <math.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/plugin-module-init.c-expected b/tests/objects/plugin-module-init.c-expected
index aeffdff2f..de299de94 100644
--- a/tests/objects/plugin-module-init.c-expected
+++ b/tests/objects/plugin-module-init.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/properties.c-expected b/tests/objects/properties.c-expected
index 107e1bb3b..00e0f0a7c 100644
--- a/tests/objects/properties.c-expected
+++ b/tests/objects/properties.c-expected
@@ -9,7 +9,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-array-length.c-expected b/tests/objects/property-array-length.c-expected
index e41c57e99..4545c4e43 100644
--- a/tests/objects/property-array-length.c-expected
+++ b/tests/objects/property-array-length.c-expected
@@ -5,7 +5,7 @@
#include <gio/gio.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-array.c-expected b/tests/objects/property-array.c-expected
index 63f9a1810..2c2898f34 100644
--- a/tests/objects/property-array.c-expected
+++ b/tests/objects/property-array.c-expected
@@ -8,7 +8,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-base-access.c-expected b/tests/objects/property-base-access.c-expected
index f36956810..49f13fb86 100644
--- a/tests/objects/property-base-access.c-expected
+++ b/tests/objects/property-base-access.c-expected
@@ -8,7 +8,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-construct-only.c-expected b/tests/objects/property-construct-only.c-expected
index a38d8885a..53a95c809 100644
--- a/tests/objects/property-construct-only.c-expected
+++ b/tests/objects/property-construct-only.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-delegate-owned.c-expected b/tests/objects/property-delegate-owned.c-expected
index cd84a11b7..2165bbf3d 100644
--- a/tests/objects/property-delegate-owned.c-expected
+++ b/tests/objects/property-delegate-owned.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-delegate.c-expected b/tests/objects/property-delegate.c-expected
index a4e09b251..4484071d5 100644
--- a/tests/objects/property-delegate.c-expected
+++ b/tests/objects/property-delegate.c-expected
@@ -8,7 +8,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-dynamic-type-inference.c-expected b/tests/objects/property-dynamic-type-inference.c-expected
index c8e9cd5db..fd323761d 100644
--- a/tests/objects/property-dynamic-type-inference.c-expected
+++ b/tests/objects/property-dynamic-type-inference.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-enum-nullable.c-expected b/tests/objects/property-enum-nullable.c-expected
index 38b6bf2d8..2b4461d16 100644
--- a/tests/objects/property-enum-nullable.c-expected
+++ b/tests/objects/property-enum-nullable.c-expected
@@ -6,7 +6,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-enum.c-expected b/tests/objects/property-enum.c-expected
index b46b26cb4..8cfdeb1ba 100644
--- a/tests/objects/property-enum.c-expected
+++ b/tests/objects/property-enum.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-gboxed-nullable.c-expected b/tests/objects/property-gboxed-nullable.c-expected
index 1438750ac..4596613c7 100644
--- a/tests/objects/property-gboxed-nullable.c-expected
+++ b/tests/objects/property-gboxed-nullable.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-notify-owned-getter.c-expected b/tests/objects/property-notify-owned-getter.c-expected
index b287aad85..50b6509ab 100644
--- a/tests/objects/property-notify-owned-getter.c-expected
+++ b/tests/objects/property-notify-owned-getter.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-notify.c-expected b/tests/objects/property-notify.c-expected
index 093715144..f8af09d51 100644
--- a/tests/objects/property-notify.c-expected
+++ b/tests/objects/property-notify.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-ownership.c-expected b/tests/objects/property-ownership.c-expected
index 8b353c1f5..b22dccc95 100644
--- a/tests/objects/property-ownership.c-expected
+++ b/tests/objects/property-ownership.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-read-only-auto.c-expected b/tests/objects/property-read-only-auto.c-expected
index ad5ba37e7..b82720afd 100644
--- a/tests/objects/property-read-only-auto.c-expected
+++ b/tests/objects/property-read-only-auto.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-real-struct-assignment.c-expected b/tests/objects/property-real-struct-assignment.c-expected
index 532fbe7f8..624f94746 100644
--- a/tests/objects/property-real-struct-assignment.c-expected
+++ b/tests/objects/property-real-struct-assignment.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-simple-type-struct-nullable.c-expected b/tests/objects/property-simple-type-struct-nullable.c-expected
index ebed89e18..cae26234b 100644
--- a/tests/objects/property-simple-type-struct-nullable.c-expected
+++ b/tests/objects/property-simple-type-struct-nullable.c-expected
@@ -6,7 +6,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-static.c-expected b/tests/objects/property-static.c-expected
index 1d57142f6..862fa16d7 100644
--- a/tests/objects/property-static.c-expected
+++ b/tests/objects/property-static.c-expected
@@ -7,7 +7,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-struct-no-gtype.c-expected b/tests/objects/property-struct-no-gtype.c-expected
index 5c17cf0e8..806eb3eb4 100644
--- a/tests/objects/property-struct-no-gtype.c-expected
+++ b/tests/objects/property-struct-no-gtype.c-expected
@@ -6,7 +6,7 @@
#include <glib-object.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/property-strv-noaccessor.c-expected b/tests/objects/property-strv-noaccessor.c-expected
index 7443e002e..04a0a017e 100644
--- a/tests/objects/property-strv-noaccessor.c-expected
+++ b/tests/objects/property-strv-noaccessor.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/regex.c-expected b/tests/objects/regex.c-expected
index 3c05606fd..e8a1fc5e2 100644
--- a/tests/objects/regex.c-expected
+++ b/tests/objects/regex.c-expected
@@ -8,7 +8,7 @@
#include <stdio.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals-default-class-handler.c-expected b/tests/objects/signals-default-class-handler.c-expected
index 55ee90c32..e40995d98 100644
--- a/tests/objects/signals-default-class-handler.c-expected
+++ b/tests/objects/signals-default-class-handler.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals-delegate-parameter.c-expected b/tests/objects/signals-delegate-parameter.c-expected
index a2dbe9af0..b1b98f686 100644
--- a/tests/objects/signals-delegate-parameter.c-expected
+++ b/tests/objects/signals-delegate-parameter.c-expected
@@ -5,7 +5,7 @@
#include <glib-object.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals-delegate.c-expected b/tests/objects/signals-delegate.c-expected
index ee1bc862a..da16f3051 100644
--- a/tests/objects/signals-delegate.c-expected
+++ b/tests/objects/signals-delegate.c-expected
@@ -7,7 +7,7 @@
#include <glib-object.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals-dynamic-emit.c-expected b/tests/objects/signals-dynamic-emit.c-expected
index 7c71e3b42..8885d8aed 100644
--- a/tests/objects/signals-dynamic-emit.c-expected
+++ b/tests/objects/signals-dynamic-emit.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals-emit.c-expected b/tests/objects/signals-emit.c-expected
index 3836abc87..1e468194d 100644
--- a/tests/objects/signals-emit.c-expected
+++ b/tests/objects/signals-emit.c-expected
@@ -7,7 +7,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals-enum-marshal.c-expected b/tests/objects/signals-enum-marshal.c-expected
index 4158246a5..f9a234bdb 100644
--- a/tests/objects/signals-enum-marshal.c-expected
+++ b/tests/objects/signals-enum-marshal.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals-error-marshal.c-expected b/tests/objects/signals-error-marshal.c-expected
index 110f63cf4..b34ee5e50 100644
--- a/tests/objects/signals-error-marshal.c-expected
+++ b/tests/objects/signals-error-marshal.c-expected
@@ -6,7 +6,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals-fundamental-return.c-expected b/tests/objects/signals-fundamental-return.c-expected
index 0fee3f75f..4c126b587 100644
--- a/tests/objects/signals-fundamental-return.c-expected
+++ b/tests/objects/signals-fundamental-return.c-expected
@@ -6,7 +6,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals-generic-return.c-expected b/tests/objects/signals-generic-return.c-expected
index 0f156d294..ba6bfc709 100644
--- a/tests/objects/signals-generic-return.c-expected
+++ b/tests/objects/signals-generic-return.c-expected
@@ -7,7 +7,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals-gobject-return.c-expected b/tests/objects/signals-gobject-return.c-expected
index a8cbb9597..e3337caa6 100644
--- a/tests/objects/signals-gobject-return.c-expected
+++ b/tests/objects/signals-gobject-return.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals-lambda-delegate.c-expected b/tests/objects/signals-lambda-delegate.c-expected
index 0e6ba11c2..665221b98 100644
--- a/tests/objects/signals-lambda-delegate.c-expected
+++ b/tests/objects/signals-lambda-delegate.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals-prototype-access.c-expected b/tests/objects/signals-prototype-access.c-expected
index 8c46ef8dd..db3e97656 100644
--- a/tests/objects/signals-prototype-access.c-expected
+++ b/tests/objects/signals-prototype-access.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals-struct-return.c-expected b/tests/objects/signals-struct-return.c-expected
index d1c7ca166..6982aaf15 100644
--- a/tests/objects/signals-struct-return.c-expected
+++ b/tests/objects/signals-struct-return.c-expected
@@ -7,7 +7,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/signals.c-expected b/tests/objects/signals.c-expected
index 2bf57024e..5e7d36ad6 100644
--- a/tests/objects/signals.c-expected
+++ b/tests/objects/signals.c-expected
@@ -8,7 +8,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/simple-generics-chainup.c-expected b/tests/objects/simple-generics-chainup.c-expected
index a4831fc33..7646e9c5e 100644
--- a/tests/objects/simple-generics-chainup.c-expected
+++ b/tests/objects/simple-generics-chainup.c-expected
@@ -6,7 +6,7 @@
#include <string.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/singleton.c-expected b/tests/objects/singleton.c-expected
index 5bb18fba6..5a5887b88 100644
--- a/tests/objects/singleton.c-expected
+++ b/tests/objects/singleton.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/test-025.c-expected b/tests/objects/test-025.c-expected
index b251c1c05..2abeaf0f3 100644
--- a/tests/objects/test-025.c-expected
+++ b/tests/objects/test-025.c-expected
@@ -6,7 +6,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/test-026.c-expected b/tests/objects/test-026.c-expected
index 29be53b9b..7adc10f8c 100644
--- a/tests/objects/test-026.c-expected
+++ b/tests/objects/test-026.c-expected
@@ -6,7 +6,7 @@
#include <stdio.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/test-029.c-expected b/tests/objects/test-029.c-expected
index d2942c7c3..7f43fe311 100644
--- a/tests/objects/test-029.c-expected
+++ b/tests/objects/test-029.c-expected
@@ -6,7 +6,7 @@
#include <stdio.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/test-034.c-expected b/tests/objects/test-034.c-expected
index 8dffb9553..9b82aefa5 100644
--- a/tests/objects/test-034.c-expected
+++ b/tests/objects/test-034.c-expected
@@ -6,7 +6,7 @@
#include <stdio.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/type-narrowing-by-precondition.c-expected b/tests/objects/type-narrowing-by-precondition.c-expected
index 672d70d72..5e6534e02 100644
--- a/tests/objects/type-narrowing-by-precondition.c-expected
+++ b/tests/objects/type-narrowing-by-precondition.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/type-narrowing-fallback.c-expected b/tests/objects/type-narrowing-fallback.c-expected
index ce85370f1..c6dcc30b8 100644
--- a/tests/objects/type-narrowing-fallback.c-expected
+++ b/tests/objects/type-narrowing-fallback.c-expected
@@ -5,7 +5,7 @@
#include <glib.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/type-narrowing.c-expected b/tests/objects/type-narrowing.c-expected
index 78d8f78ff..701d6ca98 100644
--- a/tests/objects/type-narrowing.c-expected
+++ b/tests/objects/type-narrowing.c-expected
@@ -8,7 +8,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/with-expression.c-expected b/tests/objects/with-expression.c-expected
index 7d8bdb913..64f1b6229 100644
--- a/tests/objects/with-expression.c-expected
+++ b/tests/objects/with-expression.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/with-instance.c-expected b/tests/objects/with-instance.c-expected
index 8efaf2072..74a8f1d03 100644
--- a/tests/objects/with-instance.c-expected
+++ b/tests/objects/with-instance.c-expected
@@ -8,7 +8,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/with-nested-in-lambda.c-expected b/tests/objects/with-nested-in-lambda.c-expected
index 58969da42..fede53a55 100644
--- a/tests/objects/with-nested-in-lambda.c-expected
+++ b/tests/objects/with-nested-in-lambda.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/with-nested-method.c-expected b/tests/objects/with-nested-method.c-expected
index cfb09338f..0f2878485 100644
--- a/tests/objects/with-nested-method.c-expected
+++ b/tests/objects/with-nested-method.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/with-nested-signal.c-expected b/tests/objects/with-nested-signal.c-expected
index 3d55f4e68..ea858c0de 100644
--- a/tests/objects/with-nested-signal.c-expected
+++ b/tests/objects/with-nested-signal.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/with-nested-unambigous-signal.c-expected b/tests/objects/with-nested-unambigous-signal.c-expected
index f4f1f04c7..d2a0a367d 100644
--- a/tests/objects/with-nested-unambigous-signal.c-expected
+++ b/tests/objects/with-nested-unambigous-signal.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern
diff --git a/tests/objects/with-nested.c-expected b/tests/objects/with-nested.c-expected
index 29a348258..ad16990ae 100644
--- a/tests/objects/with-nested.c-expected
+++ b/tests/objects/with-nested.c-expected
@@ -6,7 +6,7 @@
#include <gobject/gvaluecollector.h>
#if !defined(VALA_EXTERN)
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(__CYGWIN__)
#define VALA_EXTERN __declspec(dllexport) extern
#elif __GNUC__ >= 4
#define VALA_EXTERN __attribute__((visibility("default"))) extern