summaryrefslogtreecommitdiff
path: root/tests
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
parent1b63836ba222440affcde4f3036c68f009dabc2c (diff)
downloadvala-4bdb3e7301c59a32216ff383c23a4bdcf70fa268.tar.gz
tests: Update c-expected
Diffstat (limited to 'tests')
-rw-r--r--tests/annotations/deprecated-method-minimal.c-expected2
-rw-r--r--tests/annotations/deprecated-property-minimal.c-expected2
-rw-r--r--tests/annotations/deprecated.c-expected2
-rw-r--r--tests/annotations/description.c-expected2
-rw-r--r--tests/arrays/cast-struct-boxed-element-access.c-expected2
-rw-r--r--tests/arrays/class-field-fixed-length-initializer.c-expected2
-rw-r--r--tests/arrays/class-field-initializer.c-expected2
-rw-r--r--tests/arrays/class-field-length-cname.c-expected2
-rw-r--r--tests/arrays/constant-element-access.c-expected2
-rw-r--r--tests/arrays/empty-length-0.c-expected2
-rw-r--r--tests/arrays/field-global-length-cname.c-expected2
-rw-r--r--tests/arrays/fixed-length-enum-value.c-expected2
-rw-r--r--tests/arrays/inline-struct.c-expected2
-rw-r--r--tests/arrays/length-type.c-expected2
-rw-r--r--tests/arrays/resize.c-expected2
-rw-r--r--tests/arrays/slice-fixed-length.c-expected2
-rw-r--r--tests/arrays/struct-field-initializer.c-expected2
-rw-r--r--tests/arrays/struct-field-length-cname.c-expected2
-rw-r--r--tests/arrays/struct-initializer-null.c-expected2
-rw-r--r--tests/arrays/struct-namespaced-initializer.c-expected2
-rw-r--r--tests/asynchronous/bug595735.c-expected2
-rw-r--r--tests/asynchronous/bug595755.c-expected2
-rw-r--r--tests/asynchronous/bug596177.c-expected2
-rw-r--r--tests/asynchronous/bug596861.c-expected2
-rw-r--r--tests/asynchronous/bug597294.c-expected2
-rw-r--r--tests/asynchronous/bug598677.c-expected2
-rw-r--r--tests/asynchronous/bug598697.c-expected2
-rw-r--r--tests/asynchronous/bug598698.c-expected2
-rw-r--r--tests/asynchronous/bug599568.c-expected2
-rw-r--r--tests/asynchronous/bug600827.c-expected2
-rw-r--r--tests/asynchronous/bug601558.c-expected2
-rw-r--r--tests/asynchronous/bug602594.c-expected2
-rw-r--r--tests/asynchronous/bug612641.c-expected2
-rw-r--r--tests/asynchronous/bug613484.c-expected2
-rw-r--r--tests/asynchronous/bug614294.c-expected2
-rw-r--r--tests/asynchronous/bug620740.c-expected2
-rw-r--r--tests/asynchronous/bug626053.c-expected2
-rw-r--r--tests/asynchronous/bug639591.c-expected2
-rw-r--r--tests/asynchronous/bug640721.c-expected2
-rw-r--r--tests/asynchronous/bug641182.c-expected2
-rw-r--r--tests/asynchronous/bug646945.c-expected2
-rw-r--r--tests/asynchronous/bug652252.c-expected2
-rw-r--r--tests/asynchronous/bug653861.c-expected2
-rw-r--r--tests/asynchronous/bug654336.c-expected2
-rw-r--r--tests/asynchronous/bug654337.c-expected2
-rw-r--r--tests/asynchronous/bug659886.c-expected2
-rw-r--r--tests/asynchronous/bug661961.c-expected2
-rw-r--r--tests/asynchronous/bug710103.c-expected2
-rw-r--r--tests/asynchronous/bug741929.c-expected2
-rw-r--r--tests/asynchronous/bug742621.c-expected2
-rw-r--r--tests/asynchronous/bug762819.c-expected2
-rw-r--r--tests/asynchronous/bug777242.c-expected2
-rw-r--r--tests/asynchronous/bug783543.c-expected2
-rw-r--r--tests/asynchronous/bug792660.c-expected2
-rw-r--r--tests/asynchronous/bug792942.c-expected2
-rw-r--r--tests/asynchronous/bug793158.c-expected2
-rw-r--r--tests/asynchronous/captured-fixed-array.c-expected2
-rw-r--r--tests/asynchronous/catch-error-scope.c-expected2
-rw-r--r--tests/asynchronous/catch-in-finally.c-expected2
-rw-r--r--tests/asynchronous/closures.c-expected2
-rw-r--r--tests/asynchronous/constructor-argument-check.c-expected2
-rw-r--r--tests/asynchronous/finish-name.c-expected2
-rw-r--r--tests/asynchronous/generator.c-expected2
-rw-r--r--tests/asynchronous/main-block-async-call.c-expected2
-rw-r--r--tests/asynchronous/main-block-async-creation.c-expected2
-rw-r--r--tests/asynchronous/nowrapper.c-expected2
-rw-r--r--tests/asynchronous/out-parameter-free-on-error.c-expected2
-rw-r--r--tests/asynchronous/result-pos.c-expected2
-rw-r--r--tests/asynchronous/yield.c-expected2
-rw-r--r--tests/basic-types/array-uint8-uchar-compat.c-expected2
-rw-r--r--tests/basic-types/arrays-fixed-assignment.c-expected2
-rw-r--r--tests/basic-types/arrays-generics.c-expected2
-rw-r--r--tests/basic-types/arrays.c-expected2
-rw-r--r--tests/basic-types/boolean.c-expected2
-rw-r--r--tests/basic-types/bug571486.c-expected2
-rw-r--r--tests/basic-types/bug604371.c-expected2
-rw-r--r--tests/basic-types/bug622178.c-expected2
-rw-r--r--tests/basic-types/bug644046.c-expected2
-rw-r--r--tests/basic-types/bug650993.c-expected2
-rw-r--r--tests/basic-types/bug659975.c-expected2
-rw-r--r--tests/basic-types/bug678791.c-expected2
-rw-r--r--tests/basic-types/bug686336.c-expected2
-rw-r--r--tests/basic-types/bug731017.c-expected2
-rw-r--r--tests/basic-types/bug756376.c-expected2
-rw-r--r--tests/basic-types/bug761307.c-expected2
-rw-r--r--tests/basic-types/bug761736.c-expected2
-rw-r--r--tests/basic-types/bug772426.c-expected2
-rw-r--r--tests/basic-types/bug788775.c-expected2
-rw-r--r--tests/basic-types/default-gtype.c-expected2
-rw-r--r--tests/basic-types/escape-chars.c-expected2
-rw-r--r--tests/basic-types/floats.c-expected2
-rw-r--r--tests/basic-types/garray.c-expected2
-rw-r--r--tests/basic-types/gassert.c-expected2
-rw-r--r--tests/basic-types/glists.c-expected2
-rw-r--r--tests/basic-types/glists_remove.c-expected2
-rw-r--r--tests/basic-types/gptrarray.c-expected2
-rw-r--r--tests/basic-types/gvariants-unboxing-safe.c-expected2
-rw-r--r--tests/basic-types/gvariants.c-expected2
-rw-r--r--tests/basic-types/integers.c-expected2
-rw-r--r--tests/basic-types/pointers-arithmetic.c-expected2
-rw-r--r--tests/basic-types/pointers.c-expected2
-rw-r--r--tests/basic-types/strings.c-expected2
-rw-r--r--tests/bindings/gio/memoryoutputstream.c-expected2
-rw-r--r--tests/chainup/bug791785.c-expected2
-rw-r--r--tests/chainup/class-base-foo.c-expected2
-rw-r--r--tests/chainup/class-base.c-expected2
-rw-r--r--tests/chainup/class-compact-base.c-expected2
-rw-r--r--tests/chainup/class-compact-this.c-expected2
-rw-r--r--tests/chainup/class-object.c-expected2
-rw-r--r--tests/chainup/class-this-foo.c-expected2
-rw-r--r--tests/chainup/class-this.c-expected2
-rw-r--r--tests/chainup/method-lambda-base.c-expected2
-rw-r--r--tests/chainup/no-chainup.c-expected2
-rw-r--r--tests/chainup/signal-default-handler.c-expected2
-rw-r--r--tests/chainup/struct-base-foo.c-expected2
-rw-r--r--tests/chainup/struct-base.c-expected2
-rw-r--r--tests/chainup/struct-no-gtype-base.c-expected2
-rw-r--r--tests/chainup/struct-simple-no-gtype-base.c-expected2
-rw-r--r--tests/chainup/struct-this-foo.c-expected2
-rw-r--r--tests/chainup/struct-this.c-expected2
-rw-r--r--tests/constants/delegate-type.c-expected2
-rw-r--r--tests/constants/member-access-enum.c-expected2
-rw-r--r--tests/constants/member-access.c-expected2
-rw-r--r--tests/control-flow/assigned-local-variable.c-expected2
-rw-r--r--tests/control-flow/break.c-expected2
-rw-r--r--tests/control-flow/bug639482.c-expected2
-rw-r--r--tests/control-flow/bug691514.c-expected2
-rw-r--r--tests/control-flow/bug736774-1.c-expected2
-rw-r--r--tests/control-flow/bug736774-2.c-expected2
-rw-r--r--tests/control-flow/bug761267-1.c-expected2
-rw-r--r--tests/control-flow/bug761267-2.c-expected2
-rw-r--r--tests/control-flow/bug764440.c-expected2
-rw-r--r--tests/control-flow/coalesce-as-argument.c-expected2
-rw-r--r--tests/control-flow/coalesce-execution-order.c-expected2
-rw-r--r--tests/control-flow/coalesce-reference-transfer.c-expected2
-rw-r--r--tests/control-flow/coalesce-right-value.c-expected2
-rw-r--r--tests/control-flow/coalesce-short-circuit.c-expected2
-rw-r--r--tests/control-flow/conditional-as-argument.c-expected2
-rw-r--r--tests/control-flow/expressions-conditional.c-expected2
-rw-r--r--tests/control-flow/for-switch-continue.c-expected2
-rw-r--r--tests/control-flow/for.c-expected2
-rw-r--r--tests/control-flow/foreach.c-expected2
-rw-r--r--tests/control-flow/local-clash-with-implicit-this.c-expected2
-rw-r--r--tests/control-flow/lock-if-throw.c-expected2
-rw-r--r--tests/control-flow/nested-conditional.c-expected2
-rw-r--r--tests/control-flow/null-conditional-bool.c-expected2
-rw-r--r--tests/control-flow/pre-post-increment-field.c-expected2
-rw-r--r--tests/control-flow/pre-post-increment-parameter.c-expected2
-rw-r--r--tests/control-flow/pre-post-increment-property.c-expected2
-rw-r--r--tests/control-flow/sideeffects.c-expected2
-rw-r--r--tests/control-flow/switch-enum.c-expected2
-rw-r--r--tests/control-flow/switch-string.c-expected2
-rw-r--r--tests/control-flow/switch.c-expected2
-rw-r--r--tests/dbus/arrays_client.c-expected2
-rw-r--r--tests/dbus/arrays_server.c-expected2
-rw-r--r--tests/dbus/async-bus_client.c-expected2
-rw-r--r--tests/dbus/async-bus_server.c-expected2
-rw-r--r--tests/dbus/async-connection_client.c-expected2
-rw-r--r--tests/dbus/async-connection_server.c-expected2
-rw-r--r--tests/dbus/async-errors_client.c-expected2
-rw-r--r--tests/dbus/async-errors_server.c-expected2
-rw-r--r--tests/dbus/async-no-reply_client.c-expected2
-rw-r--r--tests/dbus/async-no-reply_server.c-expected2
-rw-r--r--tests/dbus/async_client.c-expected2
-rw-r--r--tests/dbus/async_server.c-expected2
-rw-r--r--tests/dbus/basic-types_client.c-expected2
-rw-r--r--tests/dbus/basic-types_server.c-expected2
-rw-r--r--tests/dbus/bug596862.c-expected2
-rw-r--r--tests/dbus/bug602003_client.c-expected2
-rw-r--r--tests/dbus/bug602003_server.c-expected2
-rw-r--r--tests/dbus/bug735437_client.c-expected2
-rw-r--r--tests/dbus/bug735437_server.c-expected2
-rw-r--r--tests/dbus/bug782719_client.c-expected2
-rw-r--r--tests/dbus/bug782719_server.c-expected2
-rw-r--r--tests/dbus/bug783002_client.c-expected2
-rw-r--r--tests/dbus/bug783002_server.c-expected2
-rw-r--r--tests/dbus/bug792277.c-expected2
-rw-r--r--tests/dbus/connection_client.c-expected2
-rw-r--r--tests/dbus/connection_server.c-expected2
-rw-r--r--tests/dbus/dicts_client.c-expected2
-rw-r--r--tests/dbus/dicts_server.c-expected2
-rw-r--r--tests/dbus/dynamic-method_client.c-expected2
-rw-r--r--tests/dbus/dynamic-method_server.c-expected2
-rw-r--r--tests/dbus/enum-string-marshalling.c-expected2
-rw-r--r--tests/dbus/errors_client.c-expected2
-rw-r--r--tests/dbus/errors_server.c-expected2
-rw-r--r--tests/dbus/filedescriptor-async_client.c-expected2
-rw-r--r--tests/dbus/filedescriptor-async_server.c-expected2
-rw-r--r--tests/dbus/filedescriptor-errors_client.c-expected2
-rw-r--r--tests/dbus/filedescriptor-errors_server.c-expected2
-rw-r--r--tests/dbus/filedescriptor_client.c-expected2
-rw-r--r--tests/dbus/filedescriptor_server.c-expected2
-rw-r--r--tests/dbus/generics_client.c-expected2
-rw-r--r--tests/dbus/generics_server.c-expected2
-rw-r--r--tests/dbus/interface-info_client.c-expected2
-rw-r--r--tests/dbus/interface-info_server.c-expected2
-rw-r--r--tests/dbus/no-reply_client.c-expected2
-rw-r--r--tests/dbus/no-reply_server.c-expected2
-rw-r--r--tests/dbus/rawvariants_client.c-expected2
-rw-r--r--tests/dbus/rawvariants_server.c-expected2
-rw-r--r--tests/dbus/signals_client.c-expected2
-rw-r--r--tests/dbus/signals_server.c-expected2
-rw-r--r--tests/dbus/structs_client.c-expected2
-rw-r--r--tests/dbus/structs_server.c-expected2
-rw-r--r--tests/delegates/bug539166.c-expected2
-rw-r--r--tests/delegates/bug595610.c-expected2
-rw-r--r--tests/delegates/bug595639.c-expected2
-rw-r--r--tests/delegates/bug638415.c-expected2
-rw-r--r--tests/delegates/bug639751.c-expected2
-rw-r--r--tests/delegates/bug659778.c-expected2
-rw-r--r--tests/delegates/bug683925.c-expected2
-rw-r--r--tests/delegates/bug703804.c-expected2
-rw-r--r--tests/delegates/bug792077.c-expected2
-rw-r--r--tests/delegates/casting.c-expected2
-rw-r--r--tests/delegates/class-field-initializer.c-expected2
-rw-r--r--tests/delegates/compatible.c-expected2
-rw-r--r--tests/delegates/delegates.c-expected2
-rw-r--r--tests/delegates/error-pos.c-expected2
-rw-r--r--tests/delegates/fields-no-target.c-expected2
-rw-r--r--tests/delegates/fields.c-expected2
-rw-r--r--tests/delegates/gclosure-conversion.c-expected2
-rw-r--r--tests/delegates/lambda-mixed-instance-static.c-expected2
-rw-r--r--tests/delegates/lambda-shared-closure.c-expected2
-rw-r--r--tests/delegates/member-target-destroy-2.c-expected2
-rw-r--r--tests/delegates/member-target-destroy.c-expected2
-rw-r--r--tests/delegates/params-array-with-throws.c-expected2
-rw-r--r--tests/delegates/params-array.c-expected2
-rw-r--r--tests/delegates/reference_transfer.c-expected2
-rw-r--r--tests/delegates/return-array-null-terminated.c-expected2
-rw-r--r--tests/delegates/variadic.c-expected2
-rw-r--r--tests/delegates/wrapper.c-expected2
-rw-r--r--tests/enums/bug614424.c-expected2
-rw-r--r--tests/enums/bug666035.c-expected2
-rw-r--r--tests/enums/bug673879.c-expected2
-rw-r--r--tests/enums/bug763831.c-expected2
-rw-r--r--tests/enums/bug780050.c-expected2
-rw-r--r--tests/enums/enum-boxed.c-expected2
-rw-r--r--tests/enums/enum_only.c-expected2
-rw-r--r--tests/enums/enums.c-expected2
-rw-r--r--tests/enums/flags.c-expected2
-rw-r--r--tests/enums/from-0-literal.c-expected2
-rw-r--r--tests/enums/in-inference.c-expected2
-rw-r--r--tests/enums/switch.c-expected2
-rw-r--r--tests/enums/unsafe-assignment.c-expected2
-rw-r--r--tests/errors/bug567181.c-expected2
-rw-r--r--tests/errors/bug579101.c-expected2
-rw-r--r--tests/errors/bug596228.c-expected2
-rw-r--r--tests/errors/bug623049.c-expected2
-rw-r--r--tests/errors/bug627090.c-expected2
-rw-r--r--tests/errors/bug639589.c-expected2
-rw-r--r--tests/errors/bug762377.c-expected2
-rw-r--r--tests/errors/bug778224.c-expected2
-rw-r--r--tests/errors/catch-error-code.c-expected2
-rw-r--r--tests/errors/catch-in-finally.c-expected2
-rw-r--r--tests/errors/default-gtype.c-expected2
-rw-r--r--tests/errors/delegate-throws-error-code.c-expected2
-rw-r--r--tests/errors/errorcode.c-expected2
-rw-r--r--tests/errors/errordomain-static-method.c-expected2
-rw-r--r--tests/errors/errordomain.c-expected2
-rw-r--r--tests/errors/errors.c-expected2
-rw-r--r--tests/errors/loops.c-expected2
-rw-r--r--tests/errors/method-throws-error-code.c-expected2
-rw-r--r--tests/errors/method-throws.c-expected2
-rw-r--r--tests/errors/unhandled.c-expected2
-rw-r--r--tests/generics/arrays.c-expected2
-rw-r--r--tests/generics/bug640330.c-expected2
-rw-r--r--tests/generics/bug694765-1.c-expected2
-rw-r--r--tests/generics/bug694765-2.c-expected2
-rw-r--r--tests/generics/constructor-chain-up.c-expected2
-rw-r--r--tests/generics/floating-type-cast.c-expected2
-rw-r--r--tests/generics/inference-argument-may-fail.c-expected2
-rw-r--r--tests/generics/inference-static-function.c-expected2
-rw-r--r--tests/generics/integer-member-access.c-expected2
-rw-r--r--tests/generics/integer-type-cast-return.c-expected2
-rw-r--r--tests/generics/integer-type-cast.c-expected2
-rw-r--r--tests/generics/member-dup-destroy.c-expected2
-rw-r--r--tests/generics/null-type.c-expected2
-rw-r--r--tests/generics/parameter-sizeof-initializer.c-expected2
-rw-r--r--tests/generics/property-gobject-set.c-expected2
-rw-r--r--tests/generics/property-int-cast.c-expected2
-rw-r--r--tests/generics/reference-transfer.c-expected2
-rw-r--r--tests/generics/string-literal-comparison.c-expected2
-rw-r--r--tests/generics/type-parameter-properties.c-expected2
-rw-r--r--tests/generics/type-parameter-property-clash.c-expected2
-rw-r--r--tests/generics/value-pointer-type-access.c-expected2
-rw-r--r--tests/genie/class-abstract.c-expected2
-rw-r--r--tests/genie/class-field.c-expected2
-rw-r--r--tests/genie/class-init.c-expected2
-rw-r--r--tests/genie/class-property.c-expected2
-rw-r--r--tests/genie/class-signal.c-expected2
-rw-r--r--tests/genie/class.c-expected2
-rw-r--r--tests/genie/enum-with-keyword-values.c-expected2
-rw-r--r--tests/genie/enum.c-expected2
-rw-r--r--tests/genie/exception.c-expected2
-rw-r--r--tests/genie/function-returns-closure.c-expected2
-rw-r--r--tests/genie/function-with-argument.c-expected2
-rw-r--r--tests/genie/function-with-return-value.c-expected2
-rw-r--r--tests/genie/function.c-expected2
-rw-r--r--tests/genie/interface.c-expected2
-rw-r--r--tests/genie/literal-template-string.c-expected2
-rw-r--r--tests/genie/struct-after-class.c-expected2
-rw-r--r--tests/genie/struct.c-expected2
-rw-r--r--tests/genie/try-except-finally.c-expected2
-rw-r--r--tests/genie/verbatim-template.c-expected2
-rw-r--r--tests/methods/argument-array-initilizer.c-expected2
-rw-r--r--tests/methods/argument-named.c-expected2
-rw-r--r--tests/methods/array-length-type.c-expected2
-rw-r--r--tests/methods/bug540483.c-expected2
-rw-r--r--tests/methods/bug595538.c-expected2
-rw-r--r--tests/methods/bug596726.c-expected2
-rw-r--r--tests/methods/bug597426.c-expected2
-rw-r--r--tests/methods/bug599892.c-expected2
-rw-r--r--tests/methods/bug613483.c-expected2
-rw-r--r--tests/methods/bug620673.c-expected2
-rw-r--r--tests/methods/bug626783.c-expected2
-rw-r--r--tests/methods/bug634753.c-expected2
-rw-r--r--tests/methods/bug639054.c-expected2
-rw-r--r--tests/methods/bug642350.c-expected2
-rw-r--r--tests/methods/bug642885.c-expected2
-rw-r--r--tests/methods/bug642899.c-expected2
-rw-r--r--tests/methods/bug648320.c-expected2
-rw-r--r--tests/methods/bug652098.c-expected2
-rw-r--r--tests/methods/bug653391.c-expected2
-rw-r--r--tests/methods/bug653908.c-expected2
-rw-r--r--tests/methods/bug663210.c-expected2
-rw-r--r--tests/methods/bug699956.c-expected2
-rw-r--r--tests/methods/bug710862.c-expected2
-rw-r--r--tests/methods/bug723009.c-expected2
-rw-r--r--tests/methods/bug726347.c-expected2
-rw-r--r--tests/methods/bug736235.c-expected2
-rw-r--r--tests/methods/bug737222.c-expected2
-rw-r--r--tests/methods/bug771964.c-expected2
-rw-r--r--tests/methods/bug774060.c-expected2
-rw-r--r--tests/methods/bug781061.c-expected2
-rw-r--r--tests/methods/bug784691.c-expected2
-rw-r--r--tests/methods/bug791215.c-expected2
-rw-r--r--tests/methods/bug791283.c-expected2
-rw-r--r--tests/methods/closures.c-expected2
-rw-r--r--tests/methods/contains.c-expected2
-rw-r--r--tests/methods/delegate-target.c-expected2
-rw-r--r--tests/methods/extern.c-expected2
-rw-r--r--tests/methods/generics.c-expected2
-rw-r--r--tests/methods/iterator.c-expected2
-rw-r--r--tests/methods/lambda.c-expected2
-rw-r--r--tests/methods/nowrapper-interface.c-expected2
-rw-r--r--tests/methods/parameter-ccode-type.c-expected2
-rw-r--r--tests/methods/parameter-fixed-array-initializer.c-expected2
-rw-r--r--tests/methods/parameter-out-free-on-error.c-expected2
-rw-r--r--tests/methods/parameter-ref-array-resize-captured.c-expected2
-rw-r--r--tests/methods/parameter-ref-array-resize.c-expected2
-rw-r--r--tests/methods/parameter-ref-delegate.c-expected2
-rw-r--r--tests/methods/parameter-ref-element-access.c-expected2
-rw-r--r--tests/methods/params-array-with-throws.c-expected2
-rw-r--r--tests/methods/params-array.c-expected2
-rw-r--r--tests/methods/postconditions-temp-variables.c-expected2
-rw-r--r--tests/methods/postconditions.c-expected2
-rw-r--r--tests/methods/preconditions-temp-variables.c-expected2
-rw-r--r--tests/methods/prepostconditions-captured.c-expected2
-rw-r--r--tests/methods/prepostconditions-contains.c-expected2
-rw-r--r--tests/methods/prepostconditions.c-expected2
-rw-r--r--tests/methods/print-attribute.c-expected2
-rw-r--r--tests/methods/profile.c-expected2
-rw-r--r--tests/methods/return-unowned-delegate.c-expected2
-rw-r--r--tests/methods/same-name.c-expected2
-rw-r--r--tests/methods/symbolresolution.c-expected2
-rw-r--r--tests/methods/varargs-delegate-without-target.c-expected2
-rw-r--r--tests/methods/varargs-delegate.c-expected2
-rw-r--r--tests/methods/varargs-gvalue.c-expected2
-rw-r--r--tests/methods/varargs-out.c-expected2
-rw-r--r--tests/methods/varargs-ref.c-expected2
-rw-r--r--tests/methods/varargs-struct.c-expected2
-rw-r--r--tests/namespace/unique.c-expected2
-rw-r--r--tests/nullability/member-access-narrowed-instance.c-expected2
-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
-rw-r--r--tests/ordering/constant-class.c-expected2
-rw-r--r--tests/ordering/constant-enum.c-expected2
-rw-r--r--tests/ordering/constant-field.c-expected2
-rw-r--r--tests/ordering/constant-struct.c-expected2
-rw-r--r--tests/ordering/delegate-class.c-expected2
-rw-r--r--tests/ordering/delegate-enum.c-expected2
-rw-r--r--tests/ordering/delegate-interface.c-expected2
-rw-r--r--tests/ordering/delegate-struct.c-expected2
-rw-r--r--tests/ordering/struct-delegate.c-expected2
-rw-r--r--tests/parser-keep-going/member-initializer.c-expected2
-rw-r--r--tests/parser/array-length.c-expected2
-rw-r--r--tests/parser/field-multi-one-line.c-expected2
-rw-r--r--tests/parser/lock-statement.c-expected2
-rw-r--r--tests/parser/member-access-pointer.c-expected2
-rw-r--r--tests/parser/member-initializer-empty.c-expected2
-rw-r--r--tests/parser/member-initializer-trailing-comma.c-expected2
-rw-r--r--tests/parser/member-initializer.c-expected2
-rw-r--r--tests/parser/namespaces.c-expected2
-rw-r--r--tests/parser/qualified-member-access.c-expected2
-rw-r--r--tests/parser/qualified-symbol-access.c-expected2
-rw-r--r--tests/parser/sealed-class.c-expected2
-rw-r--r--tests/parser/switch-statement.c-expected2
-rw-r--r--tests/parser/template.c-expected2
-rw-r--r--tests/parser/using-directive.c-expected2
-rw-r--r--tests/parser/var-type-dynamic.c-expected2
-rw-r--r--tests/parser/verbatim-template.c-expected2
-rw-r--r--tests/parser/yield-return.c-expected2
-rw-r--r--tests/pointers/bug590641.c-expected2
-rw-r--r--tests/pointers/delete.c-expected2
-rw-r--r--tests/posix/arrays.c-expected2
-rw-r--r--tests/posix/empty-length-0.c-expected2
-rw-r--r--tests/posix/string-concat.c-expected2
-rw-r--r--tests/posix/struct_only.c-expected2
-rw-r--r--tests/resolver/peek-inner-types.c-expected2
-rw-r--r--tests/semantic/assignment-element-getter-setter.c-expected2
-rw-r--r--tests/semantic/assignment-same-variable.c-expected2
-rw-r--r--tests/semantic/class-opaque-automatic-property.c-expected2
-rw-r--r--tests/semantic/class-opaque.c-expected2
-rw-r--r--tests/semantic/compare-type-check.c-expected2
-rw-r--r--tests/semantic/field-constant.c-expected2
-rw-r--r--tests/semantic/floating-reference-base-method.c-expected2
-rw-r--r--tests/semantic/floating-reference-error.c-expected2
-rw-r--r--tests/semantic/floating-reference.c-expected2
-rw-r--r--tests/semantic/localvariable-var-pointer-initializer.c-expected2
-rw-r--r--tests/semantic/member-access-static-transformed-qualified.c-expected2
-rw-r--r--tests/semantic/member-access-static-with-instance.c-expected2
-rw-r--r--tests/semantic/member-access-transformed-qualified.c-expected2
-rw-r--r--tests/semantic/with-compact.c-expected2
-rw-r--r--tests/semantic/with-declaration-cast-type.c-expected2
-rw-r--r--tests/semantic/with-declaration.c-expected2
-rw-r--r--tests/semantic/with-dereferenced-pointer.c-expected2
-rw-r--r--tests/semantic/with-enum-member.c-expected2
-rw-r--r--tests/semantic/with-null.c-expected2
-rw-r--r--tests/structs/bug530605.c-expected2
-rw-r--r--tests/structs/bug572091.c-expected2
-rw-r--r--tests/structs/bug583603.c-expected2
-rw-r--r--tests/structs/bug595587.c-expected2
-rw-r--r--tests/structs/bug596144.c-expected2
-rw-r--r--tests/structs/bug603056.c-expected2
-rw-r--r--tests/structs/bug606202.c-expected2
-rw-r--r--tests/structs/bug609642.c-expected2
-rw-r--r--tests/structs/bug613513.c-expected2
-rw-r--r--tests/structs/bug613825.c-expected2
-rw-r--r--tests/structs/bug621176.c-expected2
-rw-r--r--tests/structs/bug622422.c-expected2
-rw-r--r--tests/structs/bug623092.c-expected2
-rw-r--r--tests/structs/bug651441.c-expected2
-rw-r--r--tests/structs/bug654646.c-expected2
-rw-r--r--tests/structs/bug654753.c-expected2
-rw-r--r--tests/structs/bug656693.c-expected2
-rw-r--r--tests/structs/bug657378.c-expected2
-rw-r--r--tests/structs/bug660426.c-expected2
-rw-r--r--tests/structs/bug661945.c-expected2
-rw-r--r--tests/structs/bug667890.c-expected2
-rw-r--r--tests/structs/bug669580.c-expected2
-rw-r--r--tests/structs/bug685177.c-expected2
-rw-r--r--tests/structs/bug686190.c-expected2
-rw-r--r--tests/structs/bug688732.c-expected2
-rw-r--r--tests/structs/bug690380.c-expected2
-rw-r--r--tests/structs/bug694140.c-expected2
-rw-r--r--tests/structs/bug749952.c-expected2
-rw-r--r--tests/structs/bug775761.c-expected2
-rw-r--r--tests/structs/bug777194-2.c-expected2
-rw-r--r--tests/structs/bug777194.c-expected2
-rw-r--r--tests/structs/cast-struct-boxed.c-expected2
-rw-r--r--tests/structs/constructor-params-array.c-expected2
-rw-r--r--tests/structs/constructor-variadic.c-expected2
-rw-r--r--tests/structs/default-gtype.c-expected2
-rw-r--r--tests/structs/gtype-base-struct.c-expected2
-rw-r--r--tests/structs/gvalue-implicit-comparison.c-expected2
-rw-r--r--tests/structs/gvalue.c-expected2
-rw-r--r--tests/structs/properties.c-expected2
-rw-r--r--tests/structs/simple-type-constructor.c-expected2
-rw-r--r--tests/structs/struct-base-types.c-expected2
-rw-r--r--tests/structs/struct-boxed-cast.c-expected2
-rw-r--r--tests/structs/struct-initializer-list-in-array.c-expected2
-rw-r--r--tests/structs/struct-initializer-list-nested.c-expected2
-rw-r--r--tests/structs/struct-no-gtype.c-expected2
-rw-r--r--tests/structs/struct-static-field-initializer.c-expected2
-rw-r--r--tests/structs/struct_only.c-expected2
-rw-r--r--tests/structs/structs.c-expected2
-rw-r--r--tests/threads/threadpool.c-expected2
623 files changed, 623 insertions, 623 deletions
diff --git a/tests/annotations/deprecated-method-minimal.c-expected b/tests/annotations/deprecated-method-minimal.c-expected
index 02168bc6c..44b21e353 100644
--- a/tests/annotations/deprecated-method-minimal.c-expected
+++ b/tests/annotations/deprecated-method-minimal.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/annotations/deprecated-property-minimal.c-expected b/tests/annotations/deprecated-property-minimal.c-expected
index cebd8f46d..ad0dd65b7 100644
--- a/tests/annotations/deprecated-property-minimal.c-expected
+++ b/tests/annotations/deprecated-property-minimal.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/annotations/deprecated.c-expected b/tests/annotations/deprecated.c-expected
index c867d18f8..808df9983 100644
--- a/tests/annotations/deprecated.c-expected
+++ b/tests/annotations/deprecated.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/annotations/description.c-expected b/tests/annotations/description.c-expected
index d6527b7e8..e2d01d7a5 100644
--- a/tests/annotations/description.c-expected
+++ b/tests/annotations/description.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/arrays/cast-struct-boxed-element-access.c-expected b/tests/arrays/cast-struct-boxed-element-access.c-expected
index 82e734768..e36c1b0d9 100644
--- a/tests/arrays/cast-struct-boxed-element-access.c-expected
+++ b/tests/arrays/cast-struct-boxed-element-access.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/arrays/class-field-fixed-length-initializer.c-expected b/tests/arrays/class-field-fixed-length-initializer.c-expected
index 4b402f912..9f778d5bd 100644
--- a/tests/arrays/class-field-fixed-length-initializer.c-expected
+++ b/tests/arrays/class-field-fixed-length-initializer.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/arrays/class-field-initializer.c-expected b/tests/arrays/class-field-initializer.c-expected
index 5faddf3db..3ec7ed7f6 100644
--- a/tests/arrays/class-field-initializer.c-expected
+++ b/tests/arrays/class-field-initializer.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/arrays/class-field-length-cname.c-expected b/tests/arrays/class-field-length-cname.c-expected
index 389a0d79a..ac13ff3d2 100644
--- a/tests/arrays/class-field-length-cname.c-expected
+++ b/tests/arrays/class-field-length-cname.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/arrays/constant-element-access.c-expected b/tests/arrays/constant-element-access.c-expected
index 7fd70f27b..6278a8295 100644
--- a/tests/arrays/constant-element-access.c-expected
+++ b/tests/arrays/constant-element-access.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/arrays/empty-length-0.c-expected b/tests/arrays/empty-length-0.c-expected
index c4d7cbf68..7ed37eed4 100644
--- a/tests/arrays/empty-length-0.c-expected
+++ b/tests/arrays/empty-length-0.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/arrays/field-global-length-cname.c-expected b/tests/arrays/field-global-length-cname.c-expected
index 33e3ef1ae..0b13fba92 100644
--- a/tests/arrays/field-global-length-cname.c-expected
+++ b/tests/arrays/field-global-length-cname.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/arrays/fixed-length-enum-value.c-expected b/tests/arrays/fixed-length-enum-value.c-expected
index 372dcf4ae..fd6cf1a1d 100644
--- a/tests/arrays/fixed-length-enum-value.c-expected
+++ b/tests/arrays/fixed-length-enum-value.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/arrays/inline-struct.c-expected b/tests/arrays/inline-struct.c-expected
index 7d0e0aa50..082636479 100644
--- a/tests/arrays/inline-struct.c-expected
+++ b/tests/arrays/inline-struct.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/arrays/length-type.c-expected b/tests/arrays/length-type.c-expected
index 01bb8f7b9..3a007f4bc 100644
--- a/tests/arrays/length-type.c-expected
+++ b/tests/arrays/length-type.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/arrays/resize.c-expected b/tests/arrays/resize.c-expected
index 086493fa4..f8db3809a 100644
--- a/tests/arrays/resize.c-expected
+++ b/tests/arrays/resize.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/arrays/slice-fixed-length.c-expected b/tests/arrays/slice-fixed-length.c-expected
index 0a6d31126..68e96440e 100644
--- a/tests/arrays/slice-fixed-length.c-expected
+++ b/tests/arrays/slice-fixed-length.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/arrays/struct-field-initializer.c-expected b/tests/arrays/struct-field-initializer.c-expected
index 5bf92c2cf..c23eaf567 100644
--- a/tests/arrays/struct-field-initializer.c-expected
+++ b/tests/arrays/struct-field-initializer.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/arrays/struct-field-length-cname.c-expected b/tests/arrays/struct-field-length-cname.c-expected
index 3df783b34..07441d274 100644
--- a/tests/arrays/struct-field-length-cname.c-expected
+++ b/tests/arrays/struct-field-length-cname.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/arrays/struct-initializer-null.c-expected b/tests/arrays/struct-initializer-null.c-expected
index 4de284d9e..92f6bce3a 100644
--- a/tests/arrays/struct-initializer-null.c-expected
+++ b/tests/arrays/struct-initializer-null.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/arrays/struct-namespaced-initializer.c-expected b/tests/arrays/struct-namespaced-initializer.c-expected
index 17512a6ab..f180d2a36 100644
--- a/tests/arrays/struct-namespaced-initializer.c-expected
+++ b/tests/arrays/struct-namespaced-initializer.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/asynchronous/bug595735.c-expected b/tests/asynchronous/bug595735.c-expected
index 377573847..f1f7de6dc 100644
--- a/tests/asynchronous/bug595735.c-expected
+++ b/tests/asynchronous/bug595735.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/asynchronous/bug595755.c-expected b/tests/asynchronous/bug595755.c-expected
index 4a3b786c2..ab26da554 100644
--- a/tests/asynchronous/bug595755.c-expected
+++ b/tests/asynchronous/bug595755.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/asynchronous/bug596177.c-expected b/tests/asynchronous/bug596177.c-expected
index f80ac45e7..ebd725e10 100644
--- a/tests/asynchronous/bug596177.c-expected
+++ b/tests/asynchronous/bug596177.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/asynchronous/bug596861.c-expected b/tests/asynchronous/bug596861.c-expected
index 8139574a9..9dd714eda 100644
--- a/tests/asynchronous/bug596861.c-expected
+++ b/tests/asynchronous/bug596861.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/asynchronous/bug597294.c-expected b/tests/asynchronous/bug597294.c-expected
index ee890d6fb..ed1ea717e 100644
--- a/tests/asynchronous/bug597294.c-expected
+++ b/tests/asynchronous/bug597294.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/asynchronous/bug598677.c-expected b/tests/asynchronous/bug598677.c-expected
index 9724f6fcf..01983a816 100644
--- a/tests/asynchronous/bug598677.c-expected
+++ b/tests/asynchronous/bug598677.c-expected
@@ -7,7 +7,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/asynchronous/bug598697.c-expected b/tests/asynchronous/bug598697.c-expected
index 028b443c1..813b09b99 100644
--- a/tests/asynchronous/bug598697.c-expected
+++ b/tests/asynchronous/bug598697.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/asynchronous/bug598698.c-expected b/tests/asynchronous/bug598698.c-expected
index 1fb02af00..420a7fcce 100644
--- a/tests/asynchronous/bug598698.c-expected
+++ b/tests/asynchronous/bug598698.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/asynchronous/bug599568.c-expected b/tests/asynchronous/bug599568.c-expected
index 8ae3247b5..5785a9328 100644
--- a/tests/asynchronous/bug599568.c-expected
+++ b/tests/asynchronous/bug599568.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/asynchronous/bug600827.c-expected b/tests/asynchronous/bug600827.c-expected
index 3e94f402b..c321334ca 100644
--- a/tests/asynchronous/bug600827.c-expected
+++ b/tests/asynchronous/bug600827.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/asynchronous/bug601558.c-expected b/tests/asynchronous/bug601558.c-expected
index 081693d16..f1381b271 100644
--- a/tests/asynchronous/bug601558.c-expected
+++ b/tests/asynchronous/bug601558.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/asynchronous/bug602594.c-expected b/tests/asynchronous/bug602594.c-expected
index 0aabc315b..3ab679fdb 100644
--- a/tests/asynchronous/bug602594.c-expected
+++ b/tests/asynchronous/bug602594.c-expected
@@ -9,7 +9,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/asynchronous/bug612641.c-expected b/tests/asynchronous/bug612641.c-expected
index 78565ef37..114d4a34e 100644
--- a/tests/asynchronous/bug612641.c-expected
+++ b/tests/asynchronous/bug612641.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/asynchronous/bug613484.c-expected b/tests/asynchronous/bug613484.c-expected
index 4ddf9a962..d3059c39a 100644
--- a/tests/asynchronous/bug613484.c-expected
+++ b/tests/asynchronous/bug613484.c-expected
@@ -7,7 +7,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/asynchronous/bug614294.c-expected b/tests/asynchronous/bug614294.c-expected
index d92b9a8fe..eb6717856 100644
--- a/tests/asynchronous/bug614294.c-expected
+++ b/tests/asynchronous/bug614294.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/asynchronous/bug620740.c-expected b/tests/asynchronous/bug620740.c-expected
index e6a23ef23..399320d54 100644
--- a/tests/asynchronous/bug620740.c-expected
+++ b/tests/asynchronous/bug620740.c-expected
@@ -7,7 +7,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/asynchronous/bug626053.c-expected b/tests/asynchronous/bug626053.c-expected
index 6fa949ac1..a0308eaf9 100644
--- a/tests/asynchronous/bug626053.c-expected
+++ b/tests/asynchronous/bug626053.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/asynchronous/bug639591.c-expected b/tests/asynchronous/bug639591.c-expected
index ecc5ec297..4a766fb84 100644
--- a/tests/asynchronous/bug639591.c-expected
+++ b/tests/asynchronous/bug639591.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/asynchronous/bug640721.c-expected b/tests/asynchronous/bug640721.c-expected
index 3a0427f28..49bc7d28f 100644
--- a/tests/asynchronous/bug640721.c-expected
+++ b/tests/asynchronous/bug640721.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/asynchronous/bug641182.c-expected b/tests/asynchronous/bug641182.c-expected
index da0975cc4..6dc8b07fd 100644
--- a/tests/asynchronous/bug641182.c-expected
+++ b/tests/asynchronous/bug641182.c-expected
@@ -7,7 +7,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/asynchronous/bug646945.c-expected b/tests/asynchronous/bug646945.c-expected
index baab03038..9598cd81f 100644
--- a/tests/asynchronous/bug646945.c-expected
+++ b/tests/asynchronous/bug646945.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/asynchronous/bug652252.c-expected b/tests/asynchronous/bug652252.c-expected
index a4337dce1..163e584e2 100644
--- a/tests/asynchronous/bug652252.c-expected
+++ b/tests/asynchronous/bug652252.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/asynchronous/bug653861.c-expected b/tests/asynchronous/bug653861.c-expected
index 380dfacdf..2610c8258 100644
--- a/tests/asynchronous/bug653861.c-expected
+++ b/tests/asynchronous/bug653861.c-expected
@@ -9,7 +9,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/asynchronous/bug654336.c-expected b/tests/asynchronous/bug654336.c-expected
index 71a1e1a47..68e3edc71 100644
--- a/tests/asynchronous/bug654336.c-expected
+++ b/tests/asynchronous/bug654336.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/asynchronous/bug654337.c-expected b/tests/asynchronous/bug654337.c-expected
index 3237071f2..3e9d437c1 100644
--- a/tests/asynchronous/bug654337.c-expected
+++ b/tests/asynchronous/bug654337.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/asynchronous/bug659886.c-expected b/tests/asynchronous/bug659886.c-expected
index 75de1ed66..43ec009b0 100644
--- a/tests/asynchronous/bug659886.c-expected
+++ b/tests/asynchronous/bug659886.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/asynchronous/bug661961.c-expected b/tests/asynchronous/bug661961.c-expected
index c6f8da664..0e00fb4b5 100644
--- a/tests/asynchronous/bug661961.c-expected
+++ b/tests/asynchronous/bug661961.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/asynchronous/bug710103.c-expected b/tests/asynchronous/bug710103.c-expected
index 0913a72b6..232582fc5 100644
--- a/tests/asynchronous/bug710103.c-expected
+++ b/tests/asynchronous/bug710103.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/asynchronous/bug741929.c-expected b/tests/asynchronous/bug741929.c-expected
index 57ed28780..81aaf38d0 100644
--- a/tests/asynchronous/bug741929.c-expected
+++ b/tests/asynchronous/bug741929.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/asynchronous/bug742621.c-expected b/tests/asynchronous/bug742621.c-expected
index 093e6c43d..54f7f424d 100644
--- a/tests/asynchronous/bug742621.c-expected
+++ b/tests/asynchronous/bug742621.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/asynchronous/bug762819.c-expected b/tests/asynchronous/bug762819.c-expected
index ffb97eca0..2403e61d9 100644
--- a/tests/asynchronous/bug762819.c-expected
+++ b/tests/asynchronous/bug762819.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/asynchronous/bug777242.c-expected b/tests/asynchronous/bug777242.c-expected
index 1bfa9d031..0b15be9cc 100644
--- a/tests/asynchronous/bug777242.c-expected
+++ b/tests/asynchronous/bug777242.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/asynchronous/bug783543.c-expected b/tests/asynchronous/bug783543.c-expected
index 9d3542f63..0da28c1f9 100644
--- a/tests/asynchronous/bug783543.c-expected
+++ b/tests/asynchronous/bug783543.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/asynchronous/bug792660.c-expected b/tests/asynchronous/bug792660.c-expected
index 20c76608d..3156be7c2 100644
--- a/tests/asynchronous/bug792660.c-expected
+++ b/tests/asynchronous/bug792660.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/asynchronous/bug792942.c-expected b/tests/asynchronous/bug792942.c-expected
index 841d2cf0b..d170ffbca 100644
--- a/tests/asynchronous/bug792942.c-expected
+++ b/tests/asynchronous/bug792942.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/asynchronous/bug793158.c-expected b/tests/asynchronous/bug793158.c-expected
index 8ad749607..3f1c976be 100644
--- a/tests/asynchronous/bug793158.c-expected
+++ b/tests/asynchronous/bug793158.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/asynchronous/captured-fixed-array.c-expected b/tests/asynchronous/captured-fixed-array.c-expected
index 9d6faa299..7d4636b85 100644
--- a/tests/asynchronous/captured-fixed-array.c-expected
+++ b/tests/asynchronous/captured-fixed-array.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/asynchronous/catch-error-scope.c-expected b/tests/asynchronous/catch-error-scope.c-expected
index 4f15904f8..035b2b10f 100644
--- a/tests/asynchronous/catch-error-scope.c-expected
+++ b/tests/asynchronous/catch-error-scope.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/asynchronous/catch-in-finally.c-expected b/tests/asynchronous/catch-in-finally.c-expected
index ca37912bb..4d83d8e91 100644
--- a/tests/asynchronous/catch-in-finally.c-expected
+++ b/tests/asynchronous/catch-in-finally.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/asynchronous/closures.c-expected b/tests/asynchronous/closures.c-expected
index 9c2d0f92c..bc5a2c38b 100644
--- a/tests/asynchronous/closures.c-expected
+++ b/tests/asynchronous/closures.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/asynchronous/constructor-argument-check.c-expected b/tests/asynchronous/constructor-argument-check.c-expected
index 76d364bb0..3ac34e36b 100644
--- a/tests/asynchronous/constructor-argument-check.c-expected
+++ b/tests/asynchronous/constructor-argument-check.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/asynchronous/finish-name.c-expected b/tests/asynchronous/finish-name.c-expected
index e12dcc9b9..6c0ff755f 100644
--- a/tests/asynchronous/finish-name.c-expected
+++ b/tests/asynchronous/finish-name.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/asynchronous/generator.c-expected b/tests/asynchronous/generator.c-expected
index 56db316e6..5e5bc34ef 100644
--- a/tests/asynchronous/generator.c-expected
+++ b/tests/asynchronous/generator.c-expected
@@ -13,7 +13,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/asynchronous/main-block-async-call.c-expected b/tests/asynchronous/main-block-async-call.c-expected
index 4eae9bfdc..f13481ed9 100644
--- a/tests/asynchronous/main-block-async-call.c-expected
+++ b/tests/asynchronous/main-block-async-call.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/asynchronous/main-block-async-creation.c-expected b/tests/asynchronous/main-block-async-creation.c-expected
index f84673cd4..a928ad6f7 100644
--- a/tests/asynchronous/main-block-async-creation.c-expected
+++ b/tests/asynchronous/main-block-async-creation.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/asynchronous/nowrapper.c-expected b/tests/asynchronous/nowrapper.c-expected
index 2424afda6..a5b1ea39c 100644
--- a/tests/asynchronous/nowrapper.c-expected
+++ b/tests/asynchronous/nowrapper.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/asynchronous/out-parameter-free-on-error.c-expected b/tests/asynchronous/out-parameter-free-on-error.c-expected
index a4673d0a8..63de3571e 100644
--- a/tests/asynchronous/out-parameter-free-on-error.c-expected
+++ b/tests/asynchronous/out-parameter-free-on-error.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/asynchronous/result-pos.c-expected b/tests/asynchronous/result-pos.c-expected
index 0875b0cd8..ff6b90da5 100644
--- a/tests/asynchronous/result-pos.c-expected
+++ b/tests/asynchronous/result-pos.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/asynchronous/yield.c-expected b/tests/asynchronous/yield.c-expected
index 993fdbc33..0e968627a 100644
--- a/tests/asynchronous/yield.c-expected
+++ b/tests/asynchronous/yield.c-expected
@@ -4,7 +4,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/basic-types/array-uint8-uchar-compat.c-expected b/tests/basic-types/array-uint8-uchar-compat.c-expected
index 17cf9aed7..479b6d6ce 100644
--- a/tests/basic-types/array-uint8-uchar-compat.c-expected
+++ b/tests/basic-types/array-uint8-uchar-compat.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/basic-types/arrays-fixed-assignment.c-expected b/tests/basic-types/arrays-fixed-assignment.c-expected
index fac6d616f..6e8e1a8cd 100644
--- a/tests/basic-types/arrays-fixed-assignment.c-expected
+++ b/tests/basic-types/arrays-fixed-assignment.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/basic-types/arrays-generics.c-expected b/tests/basic-types/arrays-generics.c-expected
index 01da8c6d5..54d511acb 100644
--- a/tests/basic-types/arrays-generics.c-expected
+++ b/tests/basic-types/arrays-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/basic-types/arrays.c-expected b/tests/basic-types/arrays.c-expected
index 5c4a16709..8026d368b 100644
--- a/tests/basic-types/arrays.c-expected
+++ b/tests/basic-types/arrays.c-expected
@@ -8,7 +8,7 @@
#define FOO 2
#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/basic-types/boolean.c-expected b/tests/basic-types/boolean.c-expected
index 75de4a5bd..9b2d19655 100644
--- a/tests/basic-types/boolean.c-expected
+++ b/tests/basic-types/boolean.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/basic-types/bug571486.c-expected b/tests/basic-types/bug571486.c-expected
index 994911177..e0c5e2e99 100644
--- a/tests/basic-types/bug571486.c-expected
+++ b/tests/basic-types/bug571486.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/basic-types/bug604371.c-expected b/tests/basic-types/bug604371.c-expected
index 3f1ee88b5..c51e9ce30 100644
--- a/tests/basic-types/bug604371.c-expected
+++ b/tests/basic-types/bug604371.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/basic-types/bug622178.c-expected b/tests/basic-types/bug622178.c-expected
index a8b9cefed..58dd2122e 100644
--- a/tests/basic-types/bug622178.c-expected
+++ b/tests/basic-types/bug622178.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/basic-types/bug644046.c-expected b/tests/basic-types/bug644046.c-expected
index 21672aab2..7bf4dcbdc 100644
--- a/tests/basic-types/bug644046.c-expected
+++ b/tests/basic-types/bug644046.c-expected
@@ -5,7 +5,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/basic-types/bug650993.c-expected b/tests/basic-types/bug650993.c-expected
index 52b5df15f..a6e93fb7d 100644
--- a/tests/basic-types/bug650993.c-expected
+++ b/tests/basic-types/bug650993.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/basic-types/bug659975.c-expected b/tests/basic-types/bug659975.c-expected
index 27c3250ec..9880dfb93 100644
--- a/tests/basic-types/bug659975.c-expected
+++ b/tests/basic-types/bug659975.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/basic-types/bug678791.c-expected b/tests/basic-types/bug678791.c-expected
index 9826ce745..a020765e6 100644
--- a/tests/basic-types/bug678791.c-expected
+++ b/tests/basic-types/bug678791.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/basic-types/bug686336.c-expected b/tests/basic-types/bug686336.c-expected
index f485d7871..199283292 100644
--- a/tests/basic-types/bug686336.c-expected
+++ b/tests/basic-types/bug686336.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/basic-types/bug731017.c-expected b/tests/basic-types/bug731017.c-expected
index 5de4afa6f..6f33af5bb 100644
--- a/tests/basic-types/bug731017.c-expected
+++ b/tests/basic-types/bug731017.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/basic-types/bug756376.c-expected b/tests/basic-types/bug756376.c-expected
index 773d6921c..73acdafd4 100644
--- a/tests/basic-types/bug756376.c-expected
+++ b/tests/basic-types/bug756376.c-expected
@@ -5,7 +5,7 @@
#define FOO_BAR 5
#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/basic-types/bug761307.c-expected b/tests/basic-types/bug761307.c-expected
index 8fe2e9962..75d96d2e0 100644
--- a/tests/basic-types/bug761307.c-expected
+++ b/tests/basic-types/bug761307.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/basic-types/bug761736.c-expected b/tests/basic-types/bug761736.c-expected
index 1a2ecb8b4..faf1cde8f 100644
--- a/tests/basic-types/bug761736.c-expected
+++ b/tests/basic-types/bug761736.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/basic-types/bug772426.c-expected b/tests/basic-types/bug772426.c-expected
index 07c92c0d1..d8b712099 100644
--- a/tests/basic-types/bug772426.c-expected
+++ b/tests/basic-types/bug772426.c-expected
@@ -5,7 +5,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/basic-types/bug788775.c-expected b/tests/basic-types/bug788775.c-expected
index f0f5c33b6..248367042 100644
--- a/tests/basic-types/bug788775.c-expected
+++ b/tests/basic-types/bug788775.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/basic-types/default-gtype.c-expected b/tests/basic-types/default-gtype.c-expected
index 995f00be5..31c08607a 100644
--- a/tests/basic-types/default-gtype.c-expected
+++ b/tests/basic-types/default-gtype.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/basic-types/escape-chars.c-expected b/tests/basic-types/escape-chars.c-expected
index 2bb8e148d..36d95578b 100644
--- a/tests/basic-types/escape-chars.c-expected
+++ b/tests/basic-types/escape-chars.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/basic-types/floats.c-expected b/tests/basic-types/floats.c-expected
index 5d66d8939..cb3e0c8b2 100644
--- a/tests/basic-types/floats.c-expected
+++ b/tests/basic-types/floats.c-expected
@@ -9,7 +9,7 @@
#include <errno.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/basic-types/garray.c-expected b/tests/basic-types/garray.c-expected
index 636562418..2823b975c 100644
--- a/tests/basic-types/garray.c-expected
+++ b/tests/basic-types/garray.c-expected
@@ -9,7 +9,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/basic-types/gassert.c-expected b/tests/basic-types/gassert.c-expected
index f73315a56..83f515b7f 100644
--- a/tests/basic-types/gassert.c-expected
+++ b/tests/basic-types/gassert.c-expected
@@ -6,7 +6,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/basic-types/glists.c-expected b/tests/basic-types/glists.c-expected
index 4f3763c60..74dd6b71d 100644
--- a/tests/basic-types/glists.c-expected
+++ b/tests/basic-types/glists.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/basic-types/glists_remove.c-expected b/tests/basic-types/glists_remove.c-expected
index f8407854b..1a863b557 100644
--- a/tests/basic-types/glists_remove.c-expected
+++ b/tests/basic-types/glists_remove.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/basic-types/gptrarray.c-expected b/tests/basic-types/gptrarray.c-expected
index 47cbf5bec..88df05aef 100644
--- a/tests/basic-types/gptrarray.c-expected
+++ b/tests/basic-types/gptrarray.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/basic-types/gvariants-unboxing-safe.c-expected b/tests/basic-types/gvariants-unboxing-safe.c-expected
index 2c8c4e8a4..a7421114a 100644
--- a/tests/basic-types/gvariants-unboxing-safe.c-expected
+++ b/tests/basic-types/gvariants-unboxing-safe.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/basic-types/gvariants.c-expected b/tests/basic-types/gvariants.c-expected
index 8d4cfdd79..86544de1c 100644
--- a/tests/basic-types/gvariants.c-expected
+++ b/tests/basic-types/gvariants.c-expected
@@ -9,7 +9,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/basic-types/integers.c-expected b/tests/basic-types/integers.c-expected
index cdad296a0..77df7ee4f 100644
--- a/tests/basic-types/integers.c-expected
+++ b/tests/basic-types/integers.c-expected
@@ -7,7 +7,7 @@
#include <errno.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/basic-types/pointers-arithmetic.c-expected b/tests/basic-types/pointers-arithmetic.c-expected
index 848f092a4..ae3f09b7e 100644
--- a/tests/basic-types/pointers-arithmetic.c-expected
+++ b/tests/basic-types/pointers-arithmetic.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/basic-types/pointers.c-expected b/tests/basic-types/pointers.c-expected
index ed1a1aa5d..cf8ef1cd0 100644
--- a/tests/basic-types/pointers.c-expected
+++ b/tests/basic-types/pointers.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/basic-types/strings.c-expected b/tests/basic-types/strings.c-expected
index bc2be5ebe..f060dd0fe 100644
--- a/tests/basic-types/strings.c-expected
+++ b/tests/basic-types/strings.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/bindings/gio/memoryoutputstream.c-expected b/tests/bindings/gio/memoryoutputstream.c-expected
index 5c1131318..6087c167b 100644
--- a/tests/bindings/gio/memoryoutputstream.c-expected
+++ b/tests/bindings/gio/memoryoutputstream.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/chainup/bug791785.c-expected b/tests/chainup/bug791785.c-expected
index bfc939151..836932309 100644
--- a/tests/chainup/bug791785.c-expected
+++ b/tests/chainup/bug791785.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/chainup/class-base-foo.c-expected b/tests/chainup/class-base-foo.c-expected
index 54766f06d..97f73517c 100644
--- a/tests/chainup/class-base-foo.c-expected
+++ b/tests/chainup/class-base-foo.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/chainup/class-base.c-expected b/tests/chainup/class-base.c-expected
index 9752d6f66..cf56dcce8 100644
--- a/tests/chainup/class-base.c-expected
+++ b/tests/chainup/class-base.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/chainup/class-compact-base.c-expected b/tests/chainup/class-compact-base.c-expected
index 519b2e6b6..5caafaaa4 100644
--- a/tests/chainup/class-compact-base.c-expected
+++ b/tests/chainup/class-compact-base.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/chainup/class-compact-this.c-expected b/tests/chainup/class-compact-this.c-expected
index aaeb7299e..308bd2079 100644
--- a/tests/chainup/class-compact-this.c-expected
+++ b/tests/chainup/class-compact-this.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/chainup/class-object.c-expected b/tests/chainup/class-object.c-expected
index 9d95ec4c6..b043b3ae8 100644
--- a/tests/chainup/class-object.c-expected
+++ b/tests/chainup/class-object.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/chainup/class-this-foo.c-expected b/tests/chainup/class-this-foo.c-expected
index 3e2de9849..368a181c2 100644
--- a/tests/chainup/class-this-foo.c-expected
+++ b/tests/chainup/class-this-foo.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/chainup/class-this.c-expected b/tests/chainup/class-this.c-expected
index 1fe914c03..18214c452 100644
--- a/tests/chainup/class-this.c-expected
+++ b/tests/chainup/class-this.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/chainup/method-lambda-base.c-expected b/tests/chainup/method-lambda-base.c-expected
index cfc1a553f..f8ce82308 100644
--- a/tests/chainup/method-lambda-base.c-expected
+++ b/tests/chainup/method-lambda-base.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/chainup/no-chainup.c-expected b/tests/chainup/no-chainup.c-expected
index 1791f5084..252628c60 100644
--- a/tests/chainup/no-chainup.c-expected
+++ b/tests/chainup/no-chainup.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/chainup/signal-default-handler.c-expected b/tests/chainup/signal-default-handler.c-expected
index a4b6f5a75..cbef3c6cd 100644
--- a/tests/chainup/signal-default-handler.c-expected
+++ b/tests/chainup/signal-default-handler.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/chainup/struct-base-foo.c-expected b/tests/chainup/struct-base-foo.c-expected
index 47c39e8d6..40ad33033 100644
--- a/tests/chainup/struct-base-foo.c-expected
+++ b/tests/chainup/struct-base-foo.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/chainup/struct-base.c-expected b/tests/chainup/struct-base.c-expected
index c9c2fa049..d972698c3 100644
--- a/tests/chainup/struct-base.c-expected
+++ b/tests/chainup/struct-base.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/chainup/struct-no-gtype-base.c-expected b/tests/chainup/struct-no-gtype-base.c-expected
index 1926db780..b9aeb4b3f 100644
--- a/tests/chainup/struct-no-gtype-base.c-expected
+++ b/tests/chainup/struct-no-gtype-base.c-expected
@@ -5,7 +5,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/chainup/struct-simple-no-gtype-base.c-expected b/tests/chainup/struct-simple-no-gtype-base.c-expected
index 8ade7ae6e..425d2657c 100644
--- a/tests/chainup/struct-simple-no-gtype-base.c-expected
+++ b/tests/chainup/struct-simple-no-gtype-base.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/chainup/struct-this-foo.c-expected b/tests/chainup/struct-this-foo.c-expected
index cee0a3e9a..5613dbdb9 100644
--- a/tests/chainup/struct-this-foo.c-expected
+++ b/tests/chainup/struct-this-foo.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/chainup/struct-this.c-expected b/tests/chainup/struct-this.c-expected
index 4c8ee3336..40df5f7bf 100644
--- a/tests/chainup/struct-this.c-expected
+++ b/tests/chainup/struct-this.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/constants/delegate-type.c-expected b/tests/constants/delegate-type.c-expected
index 126728767..51427f1b6 100644
--- a/tests/constants/delegate-type.c-expected
+++ b/tests/constants/delegate-type.c-expected
@@ -7,7 +7,7 @@
#define FOO _func_foo_func
#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/constants/member-access-enum.c-expected b/tests/constants/member-access-enum.c-expected
index 9cea27ce8..7d2af3162 100644
--- a/tests/constants/member-access-enum.c-expected
+++ b/tests/constants/member-access-enum.c-expected
@@ -8,7 +8,7 @@
#define FOO FOO_MANAM
#define FAZ FOO_MINIM
#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/constants/member-access.c-expected b/tests/constants/member-access.c-expected
index c120ffd5b..132190579 100644
--- a/tests/constants/member-access.c-expected
+++ b/tests/constants/member-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/control-flow/assigned-local-variable.c-expected b/tests/control-flow/assigned-local-variable.c-expected
index ad1119fae..420b99a81 100644
--- a/tests/control-flow/assigned-local-variable.c-expected
+++ b/tests/control-flow/assigned-local-variable.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/control-flow/break.c-expected b/tests/control-flow/break.c-expected
index a806409b3..91006f272 100644
--- a/tests/control-flow/break.c-expected
+++ b/tests/control-flow/break.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/control-flow/bug639482.c-expected b/tests/control-flow/bug639482.c-expected
index d98351ebc..5e2a1273e 100644
--- a/tests/control-flow/bug639482.c-expected
+++ b/tests/control-flow/bug639482.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/control-flow/bug691514.c-expected b/tests/control-flow/bug691514.c-expected
index a9d9a29b1..f04d75092 100644
--- a/tests/control-flow/bug691514.c-expected
+++ b/tests/control-flow/bug691514.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/control-flow/bug736774-1.c-expected b/tests/control-flow/bug736774-1.c-expected
index f687209d9..24430a631 100644
--- a/tests/control-flow/bug736774-1.c-expected
+++ b/tests/control-flow/bug736774-1.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/control-flow/bug736774-2.c-expected b/tests/control-flow/bug736774-2.c-expected
index b9567e16d..7ed25ee48 100644
--- a/tests/control-flow/bug736774-2.c-expected
+++ b/tests/control-flow/bug736774-2.c-expected
@@ -7,7 +7,7 @@
#include <glib/gi18n-lib.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/control-flow/bug761267-1.c-expected b/tests/control-flow/bug761267-1.c-expected
index fdf7617e9..ba206dd14 100644
--- a/tests/control-flow/bug761267-1.c-expected
+++ b/tests/control-flow/bug761267-1.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/control-flow/bug761267-2.c-expected b/tests/control-flow/bug761267-2.c-expected
index 14476bde5..d055d2721 100644
--- a/tests/control-flow/bug761267-2.c-expected
+++ b/tests/control-flow/bug761267-2.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/control-flow/bug764440.c-expected b/tests/control-flow/bug764440.c-expected
index e5e3b5b8a..82c107821 100644
--- a/tests/control-flow/bug764440.c-expected
+++ b/tests/control-flow/bug764440.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/control-flow/coalesce-as-argument.c-expected b/tests/control-flow/coalesce-as-argument.c-expected
index 2ca2a881f..0c6aac523 100644
--- a/tests/control-flow/coalesce-as-argument.c-expected
+++ b/tests/control-flow/coalesce-as-argument.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/control-flow/coalesce-execution-order.c-expected b/tests/control-flow/coalesce-execution-order.c-expected
index efaf3e11e..3e6b67240 100644
--- a/tests/control-flow/coalesce-execution-order.c-expected
+++ b/tests/control-flow/coalesce-execution-order.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/control-flow/coalesce-reference-transfer.c-expected b/tests/control-flow/coalesce-reference-transfer.c-expected
index 9a27fcba1..57cd357fe 100644
--- a/tests/control-flow/coalesce-reference-transfer.c-expected
+++ b/tests/control-flow/coalesce-reference-transfer.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/control-flow/coalesce-right-value.c-expected b/tests/control-flow/coalesce-right-value.c-expected
index 85fb39c40..4d33019c6 100644
--- a/tests/control-flow/coalesce-right-value.c-expected
+++ b/tests/control-flow/coalesce-right-value.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/control-flow/coalesce-short-circuit.c-expected b/tests/control-flow/coalesce-short-circuit.c-expected
index 461a854a0..e5bb2f103 100644
--- a/tests/control-flow/coalesce-short-circuit.c-expected
+++ b/tests/control-flow/coalesce-short-circuit.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/control-flow/conditional-as-argument.c-expected b/tests/control-flow/conditional-as-argument.c-expected
index 880af4204..0b0785faf 100644
--- a/tests/control-flow/conditional-as-argument.c-expected
+++ b/tests/control-flow/conditional-as-argument.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/control-flow/expressions-conditional.c-expected b/tests/control-flow/expressions-conditional.c-expected
index 0e026d864..1f17bce4f 100644
--- a/tests/control-flow/expressions-conditional.c-expected
+++ b/tests/control-flow/expressions-conditional.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/control-flow/for-switch-continue.c-expected b/tests/control-flow/for-switch-continue.c-expected
index b6a5eeafe..f16bb2984 100644
--- a/tests/control-flow/for-switch-continue.c-expected
+++ b/tests/control-flow/for-switch-continue.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/control-flow/for.c-expected b/tests/control-flow/for.c-expected
index f873866c4..bf066d0dd 100644
--- a/tests/control-flow/for.c-expected
+++ b/tests/control-flow/for.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/control-flow/foreach.c-expected b/tests/control-flow/foreach.c-expected
index 0f9bd45f9..c402e1c12 100644
--- a/tests/control-flow/foreach.c-expected
+++ b/tests/control-flow/foreach.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/control-flow/local-clash-with-implicit-this.c-expected b/tests/control-flow/local-clash-with-implicit-this.c-expected
index ea99a1cc2..a4642eaa9 100644
--- a/tests/control-flow/local-clash-with-implicit-this.c-expected
+++ b/tests/control-flow/local-clash-with-implicit-this.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/control-flow/lock-if-throw.c-expected b/tests/control-flow/lock-if-throw.c-expected
index 7912c9826..4debb0d7b 100644
--- a/tests/control-flow/lock-if-throw.c-expected
+++ b/tests/control-flow/lock-if-throw.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/control-flow/nested-conditional.c-expected b/tests/control-flow/nested-conditional.c-expected
index 75f1eba35..f877c9dbc 100644
--- a/tests/control-flow/nested-conditional.c-expected
+++ b/tests/control-flow/nested-conditional.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/control-flow/null-conditional-bool.c-expected b/tests/control-flow/null-conditional-bool.c-expected
index 4ab15553a..ed2655ec2 100644
--- a/tests/control-flow/null-conditional-bool.c-expected
+++ b/tests/control-flow/null-conditional-bool.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/control-flow/pre-post-increment-field.c-expected b/tests/control-flow/pre-post-increment-field.c-expected
index d8d16ceb5..c2c6ddaa8 100644
--- a/tests/control-flow/pre-post-increment-field.c-expected
+++ b/tests/control-flow/pre-post-increment-field.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/control-flow/pre-post-increment-parameter.c-expected b/tests/control-flow/pre-post-increment-parameter.c-expected
index 2e328efdc..7158d07db 100644
--- a/tests/control-flow/pre-post-increment-parameter.c-expected
+++ b/tests/control-flow/pre-post-increment-parameter.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/control-flow/pre-post-increment-property.c-expected b/tests/control-flow/pre-post-increment-property.c-expected
index 96949d224..2889edd1a 100644
--- a/tests/control-flow/pre-post-increment-property.c-expected
+++ b/tests/control-flow/pre-post-increment-property.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/control-flow/sideeffects.c-expected b/tests/control-flow/sideeffects.c-expected
index 81c928fd6..5cf07ad45 100644
--- a/tests/control-flow/sideeffects.c-expected
+++ b/tests/control-flow/sideeffects.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/control-flow/switch-enum.c-expected b/tests/control-flow/switch-enum.c-expected
index fc8507bc4..c4dd73ad0 100644
--- a/tests/control-flow/switch-enum.c-expected
+++ b/tests/control-flow/switch-enum.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/control-flow/switch-string.c-expected b/tests/control-flow/switch-string.c-expected
index c8d66e6ff..b1643fe31 100644
--- a/tests/control-flow/switch-string.c-expected
+++ b/tests/control-flow/switch-string.c-expected
@@ -9,7 +9,7 @@
#define BAR "bar"
#define MANAM "manam"
#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/control-flow/switch.c-expected b/tests/control-flow/switch.c-expected
index 6e7834d96..242d8cd5d 100644
--- a/tests/control-flow/switch.c-expected
+++ b/tests/control-flow/switch.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/dbus/arrays_client.c-expected b/tests/dbus/arrays_client.c-expected
index b46f5548d..5b5a1f327 100644
--- a/tests/dbus/arrays_client.c-expected
+++ b/tests/dbus/arrays_client.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/dbus/arrays_server.c-expected b/tests/dbus/arrays_server.c-expected
index e382242dd..5ff21a8d5 100644
--- a/tests/dbus/arrays_server.c-expected
+++ b/tests/dbus/arrays_server.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/dbus/async-bus_client.c-expected b/tests/dbus/async-bus_client.c-expected
index dfac708c2..97b1623ba 100644
--- a/tests/dbus/async-bus_client.c-expected
+++ b/tests/dbus/async-bus_client.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/dbus/async-bus_server.c-expected b/tests/dbus/async-bus_server.c-expected
index f26a33350..907b85378 100644
--- a/tests/dbus/async-bus_server.c-expected
+++ b/tests/dbus/async-bus_server.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/dbus/async-connection_client.c-expected b/tests/dbus/async-connection_client.c-expected
index c76d0834d..5fd5cd310 100644
--- a/tests/dbus/async-connection_client.c-expected
+++ b/tests/dbus/async-connection_client.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/dbus/async-connection_server.c-expected b/tests/dbus/async-connection_server.c-expected
index ba0683199..3dc2f7be9 100644
--- a/tests/dbus/async-connection_server.c-expected
+++ b/tests/dbus/async-connection_server.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/dbus/async-errors_client.c-expected b/tests/dbus/async-errors_client.c-expected
index 573344551..bc2ee3b19 100644
--- a/tests/dbus/async-errors_client.c-expected
+++ b/tests/dbus/async-errors_client.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/dbus/async-errors_server.c-expected b/tests/dbus/async-errors_server.c-expected
index aaae816eb..fdd9ebf14 100644
--- a/tests/dbus/async-errors_server.c-expected
+++ b/tests/dbus/async-errors_server.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/dbus/async-no-reply_client.c-expected b/tests/dbus/async-no-reply_client.c-expected
index 995bc1dc3..d865c34a2 100644
--- a/tests/dbus/async-no-reply_client.c-expected
+++ b/tests/dbus/async-no-reply_client.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/dbus/async-no-reply_server.c-expected b/tests/dbus/async-no-reply_server.c-expected
index e2e894c60..29b8afc4b 100644
--- a/tests/dbus/async-no-reply_server.c-expected
+++ b/tests/dbus/async-no-reply_server.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/dbus/async_client.c-expected b/tests/dbus/async_client.c-expected
index c108a12b8..3fdbe863d 100644
--- a/tests/dbus/async_client.c-expected
+++ b/tests/dbus/async_client.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/dbus/async_server.c-expected b/tests/dbus/async_server.c-expected
index 81a1ee80b..c6f2659b8 100644
--- a/tests/dbus/async_server.c-expected
+++ b/tests/dbus/async_server.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/dbus/basic-types_client.c-expected b/tests/dbus/basic-types_client.c-expected
index 71da10ef2..0c6a0b6e5 100644
--- a/tests/dbus/basic-types_client.c-expected
+++ b/tests/dbus/basic-types_client.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/dbus/basic-types_server.c-expected b/tests/dbus/basic-types_server.c-expected
index dd8f53d52..dd766b201 100644
--- a/tests/dbus/basic-types_server.c-expected
+++ b/tests/dbus/basic-types_server.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/dbus/bug596862.c-expected b/tests/dbus/bug596862.c-expected
index 0d0f81569..96ea7bdf9 100644
--- a/tests/dbus/bug596862.c-expected
+++ b/tests/dbus/bug596862.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/dbus/bug602003_client.c-expected b/tests/dbus/bug602003_client.c-expected
index ec06c433f..196d44127 100644
--- a/tests/dbus/bug602003_client.c-expected
+++ b/tests/dbus/bug602003_client.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/dbus/bug602003_server.c-expected b/tests/dbus/bug602003_server.c-expected
index 7fe965ed6..de6b7909a 100644
--- a/tests/dbus/bug602003_server.c-expected
+++ b/tests/dbus/bug602003_server.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/dbus/bug735437_client.c-expected b/tests/dbus/bug735437_client.c-expected
index dc44533a5..baeac8426 100644
--- a/tests/dbus/bug735437_client.c-expected
+++ b/tests/dbus/bug735437_client.c-expected
@@ -10,7 +10,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/dbus/bug735437_server.c-expected b/tests/dbus/bug735437_server.c-expected
index 82e199e41..04ba5c08b 100644
--- a/tests/dbus/bug735437_server.c-expected
+++ b/tests/dbus/bug735437_server.c-expected
@@ -10,7 +10,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/dbus/bug782719_client.c-expected b/tests/dbus/bug782719_client.c-expected
index 22512e652..102c54bf0 100644
--- a/tests/dbus/bug782719_client.c-expected
+++ b/tests/dbus/bug782719_client.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/dbus/bug782719_server.c-expected b/tests/dbus/bug782719_server.c-expected
index 970ddcf5d..d04737496 100644
--- a/tests/dbus/bug782719_server.c-expected
+++ b/tests/dbus/bug782719_server.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/dbus/bug783002_client.c-expected b/tests/dbus/bug783002_client.c-expected
index 270f433d4..a6c8bb783 100644
--- a/tests/dbus/bug783002_client.c-expected
+++ b/tests/dbus/bug783002_client.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/dbus/bug783002_server.c-expected b/tests/dbus/bug783002_server.c-expected
index 679154f0f..988e907e6 100644
--- a/tests/dbus/bug783002_server.c-expected
+++ b/tests/dbus/bug783002_server.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/dbus/bug792277.c-expected b/tests/dbus/bug792277.c-expected
index a9aca9d15..b51313a6a 100644
--- a/tests/dbus/bug792277.c-expected
+++ b/tests/dbus/bug792277.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/dbus/connection_client.c-expected b/tests/dbus/connection_client.c-expected
index ad172cced..3b501c83a 100644
--- a/tests/dbus/connection_client.c-expected
+++ b/tests/dbus/connection_client.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/dbus/connection_server.c-expected b/tests/dbus/connection_server.c-expected
index 561a66db6..3ac8eb355 100644
--- a/tests/dbus/connection_server.c-expected
+++ b/tests/dbus/connection_server.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/dbus/dicts_client.c-expected b/tests/dbus/dicts_client.c-expected
index ad7130d8f..6b5dde899 100644
--- a/tests/dbus/dicts_client.c-expected
+++ b/tests/dbus/dicts_client.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/dbus/dicts_server.c-expected b/tests/dbus/dicts_server.c-expected
index 1e22e2c83..872b5947c 100644
--- a/tests/dbus/dicts_server.c-expected
+++ b/tests/dbus/dicts_server.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/dbus/dynamic-method_client.c-expected b/tests/dbus/dynamic-method_client.c-expected
index d06bec69d..85b77c7d9 100644
--- a/tests/dbus/dynamic-method_client.c-expected
+++ b/tests/dbus/dynamic-method_client.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/dbus/dynamic-method_server.c-expected b/tests/dbus/dynamic-method_server.c-expected
index 926a5b25d..73c8dffd6 100644
--- a/tests/dbus/dynamic-method_server.c-expected
+++ b/tests/dbus/dynamic-method_server.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/dbus/enum-string-marshalling.c-expected b/tests/dbus/enum-string-marshalling.c-expected
index 2694775d2..c4120286b 100644
--- a/tests/dbus/enum-string-marshalling.c-expected
+++ b/tests/dbus/enum-string-marshalling.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/dbus/errors_client.c-expected b/tests/dbus/errors_client.c-expected
index 8f1209285..ce075f67f 100644
--- a/tests/dbus/errors_client.c-expected
+++ b/tests/dbus/errors_client.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/dbus/errors_server.c-expected b/tests/dbus/errors_server.c-expected
index 8406a6eab..4a6145849 100644
--- a/tests/dbus/errors_server.c-expected
+++ b/tests/dbus/errors_server.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/dbus/filedescriptor-async_client.c-expected b/tests/dbus/filedescriptor-async_client.c-expected
index b458ecf02..7d61cbfa9 100644
--- a/tests/dbus/filedescriptor-async_client.c-expected
+++ b/tests/dbus/filedescriptor-async_client.c-expected
@@ -10,7 +10,7 @@
#include <unistd.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/dbus/filedescriptor-async_server.c-expected b/tests/dbus/filedescriptor-async_server.c-expected
index 5c9aa9720..e1ada51ec 100644
--- a/tests/dbus/filedescriptor-async_server.c-expected
+++ b/tests/dbus/filedescriptor-async_server.c-expected
@@ -11,7 +11,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/dbus/filedescriptor-errors_client.c-expected b/tests/dbus/filedescriptor-errors_client.c-expected
index 13e5b50bc..8283f87c0 100644
--- a/tests/dbus/filedescriptor-errors_client.c-expected
+++ b/tests/dbus/filedescriptor-errors_client.c-expected
@@ -12,7 +12,7 @@
#include <unistd.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/dbus/filedescriptor-errors_server.c-expected b/tests/dbus/filedescriptor-errors_server.c-expected
index 23c14621b..462825919 100644
--- a/tests/dbus/filedescriptor-errors_server.c-expected
+++ b/tests/dbus/filedescriptor-errors_server.c-expected
@@ -12,7 +12,7 @@
#include <sys/types.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/dbus/filedescriptor_client.c-expected b/tests/dbus/filedescriptor_client.c-expected
index 1a3a8473a..8a19b0573 100644
--- a/tests/dbus/filedescriptor_client.c-expected
+++ b/tests/dbus/filedescriptor_client.c-expected
@@ -10,7 +10,7 @@
#include <unistd.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/dbus/filedescriptor_server.c-expected b/tests/dbus/filedescriptor_server.c-expected
index 4ff455497..04c8aac26 100644
--- a/tests/dbus/filedescriptor_server.c-expected
+++ b/tests/dbus/filedescriptor_server.c-expected
@@ -11,7 +11,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/dbus/generics_client.c-expected b/tests/dbus/generics_client.c-expected
index 358753685..68c3c5402 100644
--- a/tests/dbus/generics_client.c-expected
+++ b/tests/dbus/generics_client.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/dbus/generics_server.c-expected b/tests/dbus/generics_server.c-expected
index e7b173f86..54c44e129 100644
--- a/tests/dbus/generics_server.c-expected
+++ b/tests/dbus/generics_server.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/dbus/interface-info_client.c-expected b/tests/dbus/interface-info_client.c-expected
index 3822e2dc3..1ab152a76 100644
--- a/tests/dbus/interface-info_client.c-expected
+++ b/tests/dbus/interface-info_client.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/dbus/interface-info_server.c-expected b/tests/dbus/interface-info_server.c-expected
index a23553fda..677946cf2 100644
--- a/tests/dbus/interface-info_server.c-expected
+++ b/tests/dbus/interface-info_server.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/dbus/no-reply_client.c-expected b/tests/dbus/no-reply_client.c-expected
index 354f61cbb..01406da99 100644
--- a/tests/dbus/no-reply_client.c-expected
+++ b/tests/dbus/no-reply_client.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/dbus/no-reply_server.c-expected b/tests/dbus/no-reply_server.c-expected
index c1f2584a7..5fc421f41 100644
--- a/tests/dbus/no-reply_server.c-expected
+++ b/tests/dbus/no-reply_server.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/dbus/rawvariants_client.c-expected b/tests/dbus/rawvariants_client.c-expected
index 801109028..f5c05890e 100644
--- a/tests/dbus/rawvariants_client.c-expected
+++ b/tests/dbus/rawvariants_client.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/dbus/rawvariants_server.c-expected b/tests/dbus/rawvariants_server.c-expected
index ec24125de..6273bc99b 100644
--- a/tests/dbus/rawvariants_server.c-expected
+++ b/tests/dbus/rawvariants_server.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/dbus/signals_client.c-expected b/tests/dbus/signals_client.c-expected
index 9442943e9..7f6db1a08 100644
--- a/tests/dbus/signals_client.c-expected
+++ b/tests/dbus/signals_client.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/dbus/signals_server.c-expected b/tests/dbus/signals_server.c-expected
index 9f9c78102..029372eb5 100644
--- a/tests/dbus/signals_server.c-expected
+++ b/tests/dbus/signals_server.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/dbus/structs_client.c-expected b/tests/dbus/structs_client.c-expected
index 00223fea2..c0e95f3b5 100644
--- a/tests/dbus/structs_client.c-expected
+++ b/tests/dbus/structs_client.c-expected
@@ -8,7 +8,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/dbus/structs_server.c-expected b/tests/dbus/structs_server.c-expected
index 83250e523..7eefbae96 100644
--- a/tests/dbus/structs_server.c-expected
+++ b/tests/dbus/structs_server.c-expected
@@ -8,7 +8,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/delegates/bug539166.c-expected b/tests/delegates/bug539166.c-expected
index c335a36fe..76c6e5b64 100644
--- a/tests/delegates/bug539166.c-expected
+++ b/tests/delegates/bug539166.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/delegates/bug595610.c-expected b/tests/delegates/bug595610.c-expected
index 898b76b65..b48639c51 100644
--- a/tests/delegates/bug595610.c-expected
+++ b/tests/delegates/bug595610.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/delegates/bug595639.c-expected b/tests/delegates/bug595639.c-expected
index c39528bf7..71ce0e77b 100644
--- a/tests/delegates/bug595639.c-expected
+++ b/tests/delegates/bug595639.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/delegates/bug638415.c-expected b/tests/delegates/bug638415.c-expected
index 367a2cc95..bf26531c7 100644
--- a/tests/delegates/bug638415.c-expected
+++ b/tests/delegates/bug638415.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/delegates/bug639751.c-expected b/tests/delegates/bug639751.c-expected
index b0586a6fd..821b10481 100644
--- a/tests/delegates/bug639751.c-expected
+++ b/tests/delegates/bug639751.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/delegates/bug659778.c-expected b/tests/delegates/bug659778.c-expected
index 135d5f436..8bf706683 100644
--- a/tests/delegates/bug659778.c-expected
+++ b/tests/delegates/bug659778.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/delegates/bug683925.c-expected b/tests/delegates/bug683925.c-expected
index cc747164a..99b400ef1 100644
--- a/tests/delegates/bug683925.c-expected
+++ b/tests/delegates/bug683925.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/delegates/bug703804.c-expected b/tests/delegates/bug703804.c-expected
index b26578a3b..eace5c171 100644
--- a/tests/delegates/bug703804.c-expected
+++ b/tests/delegates/bug703804.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/delegates/bug792077.c-expected b/tests/delegates/bug792077.c-expected
index 5abd863a4..1839c4ddf 100644
--- a/tests/delegates/bug792077.c-expected
+++ b/tests/delegates/bug792077.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/delegates/casting.c-expected b/tests/delegates/casting.c-expected
index fe15b7acf..c4bb71ed1 100644
--- a/tests/delegates/casting.c-expected
+++ b/tests/delegates/casting.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/delegates/class-field-initializer.c-expected b/tests/delegates/class-field-initializer.c-expected
index c21138848..f981813f1 100644
--- a/tests/delegates/class-field-initializer.c-expected
+++ b/tests/delegates/class-field-initializer.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/delegates/compatible.c-expected b/tests/delegates/compatible.c-expected
index 3eaecad79..96e63ee7d 100644
--- a/tests/delegates/compatible.c-expected
+++ b/tests/delegates/compatible.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/delegates/delegates.c-expected b/tests/delegates/delegates.c-expected
index 06d31b398..1ee17151c 100644
--- a/tests/delegates/delegates.c-expected
+++ b/tests/delegates/delegates.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/delegates/error-pos.c-expected b/tests/delegates/error-pos.c-expected
index 1aa5874f1..bd789b87e 100644
--- a/tests/delegates/error-pos.c-expected
+++ b/tests/delegates/error-pos.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/delegates/fields-no-target.c-expected b/tests/delegates/fields-no-target.c-expected
index d065ea232..ae9617c79 100644
--- a/tests/delegates/fields-no-target.c-expected
+++ b/tests/delegates/fields-no-target.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/delegates/fields.c-expected b/tests/delegates/fields.c-expected
index 3b4ae26fc..828c419f8 100644
--- a/tests/delegates/fields.c-expected
+++ b/tests/delegates/fields.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/delegates/gclosure-conversion.c-expected b/tests/delegates/gclosure-conversion.c-expected
index 916299d7c..c86f4fc31 100644
--- a/tests/delegates/gclosure-conversion.c-expected
+++ b/tests/delegates/gclosure-conversion.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/delegates/lambda-mixed-instance-static.c-expected b/tests/delegates/lambda-mixed-instance-static.c-expected
index 1beb45a96..9935bc4be 100644
--- a/tests/delegates/lambda-mixed-instance-static.c-expected
+++ b/tests/delegates/lambda-mixed-instance-static.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/delegates/lambda-shared-closure.c-expected b/tests/delegates/lambda-shared-closure.c-expected
index 7d99502c3..ee374e9c8 100644
--- a/tests/delegates/lambda-shared-closure.c-expected
+++ b/tests/delegates/lambda-shared-closure.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/delegates/member-target-destroy-2.c-expected b/tests/delegates/member-target-destroy-2.c-expected
index 17b11e223..604f81914 100644
--- a/tests/delegates/member-target-destroy-2.c-expected
+++ b/tests/delegates/member-target-destroy-2.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/delegates/member-target-destroy.c-expected b/tests/delegates/member-target-destroy.c-expected
index 0fd0ff714..4baa3eef5 100644
--- a/tests/delegates/member-target-destroy.c-expected
+++ b/tests/delegates/member-target-destroy.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/delegates/params-array-with-throws.c-expected b/tests/delegates/params-array-with-throws.c-expected
index 68b33b8d7..f3734d7f9 100644
--- a/tests/delegates/params-array-with-throws.c-expected
+++ b/tests/delegates/params-array-with-throws.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/delegates/params-array.c-expected b/tests/delegates/params-array.c-expected
index 74a7d084c..339c072a0 100644
--- a/tests/delegates/params-array.c-expected
+++ b/tests/delegates/params-array.c-expected
@@ -9,7 +9,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/delegates/reference_transfer.c-expected b/tests/delegates/reference_transfer.c-expected
index 9a8d00e42..6eda31992 100644
--- a/tests/delegates/reference_transfer.c-expected
+++ b/tests/delegates/reference_transfer.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/delegates/return-array-null-terminated.c-expected b/tests/delegates/return-array-null-terminated.c-expected
index 4a89bb8f9..a6b7845ce 100644
--- a/tests/delegates/return-array-null-terminated.c-expected
+++ b/tests/delegates/return-array-null-terminated.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/delegates/variadic.c-expected b/tests/delegates/variadic.c-expected
index 176dd015e..7df1cf3ff 100644
--- a/tests/delegates/variadic.c-expected
+++ b/tests/delegates/variadic.c-expected
@@ -8,7 +8,7 @@
#include <stdarg.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/delegates/wrapper.c-expected b/tests/delegates/wrapper.c-expected
index 361445ecc..8271772e6 100644
--- a/tests/delegates/wrapper.c-expected
+++ b/tests/delegates/wrapper.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/enums/bug614424.c-expected b/tests/enums/bug614424.c-expected
index 70268aa83..c38fd5949 100644
--- a/tests/enums/bug614424.c-expected
+++ b/tests/enums/bug614424.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/enums/bug666035.c-expected b/tests/enums/bug666035.c-expected
index cbc78c93b..0b4944c5d 100644
--- a/tests/enums/bug666035.c-expected
+++ b/tests/enums/bug666035.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/enums/bug673879.c-expected b/tests/enums/bug673879.c-expected
index 98853ff12..5db030c1c 100644
--- a/tests/enums/bug673879.c-expected
+++ b/tests/enums/bug673879.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/enums/bug763831.c-expected b/tests/enums/bug763831.c-expected
index 94bdf4ed5..318d49a94 100644
--- a/tests/enums/bug763831.c-expected
+++ b/tests/enums/bug763831.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/enums/bug780050.c-expected b/tests/enums/bug780050.c-expected
index a9f1f51e6..c9f61de71 100644
--- a/tests/enums/bug780050.c-expected
+++ b/tests/enums/bug780050.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/enums/enum-boxed.c-expected b/tests/enums/enum-boxed.c-expected
index 56ed9339c..e00545d26 100644
--- a/tests/enums/enum-boxed.c-expected
+++ b/tests/enums/enum-boxed.c-expected
@@ -8,7 +8,7 @@
#define FOO FOO_BAR
#define BAR BAR_FOO
#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/enums/enum_only.c-expected b/tests/enums/enum_only.c-expected
index 9162eace4..d0a225b79 100644
--- a/tests/enums/enum_only.c-expected
+++ b/tests/enums/enum_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/enums/enums.c-expected b/tests/enums/enums.c-expected
index a6594015b..6a8d97a58 100644
--- a/tests/enums/enums.c-expected
+++ b/tests/enums/enums.c-expected
@@ -7,7 +7,7 @@
#define MAMAN_FOOISH_FOO 2
#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/enums/flags.c-expected b/tests/enums/flags.c-expected
index d44b84f89..4c84d3687 100644
--- a/tests/enums/flags.c-expected
+++ b/tests/enums/flags.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/enums/from-0-literal.c-expected b/tests/enums/from-0-literal.c-expected
index e06f40799..1fcea79e6 100644
--- a/tests/enums/from-0-literal.c-expected
+++ b/tests/enums/from-0-literal.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/enums/in-inference.c-expected b/tests/enums/in-inference.c-expected
index c859a0676..139f3ad4c 100644
--- a/tests/enums/in-inference.c-expected
+++ b/tests/enums/in-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/enums/switch.c-expected b/tests/enums/switch.c-expected
index 91c674d3b..c1f57dc5c 100644
--- a/tests/enums/switch.c-expected
+++ b/tests/enums/switch.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/enums/unsafe-assignment.c-expected b/tests/enums/unsafe-assignment.c-expected
index ba8ac7084..b90c6496a 100644
--- a/tests/enums/unsafe-assignment.c-expected
+++ b/tests/enums/unsafe-assignment.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/errors/bug567181.c-expected b/tests/errors/bug567181.c-expected
index 6d811473f..baca926f5 100644
--- a/tests/errors/bug567181.c-expected
+++ b/tests/errors/bug567181.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/errors/bug579101.c-expected b/tests/errors/bug579101.c-expected
index 0fac3fdd2..613275723 100644
--- a/tests/errors/bug579101.c-expected
+++ b/tests/errors/bug579101.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/errors/bug596228.c-expected b/tests/errors/bug596228.c-expected
index 11172b49d..57efe1d20 100644
--- a/tests/errors/bug596228.c-expected
+++ b/tests/errors/bug596228.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/errors/bug623049.c-expected b/tests/errors/bug623049.c-expected
index 403ab58af..0fa60e091 100644
--- a/tests/errors/bug623049.c-expected
+++ b/tests/errors/bug623049.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/errors/bug627090.c-expected b/tests/errors/bug627090.c-expected
index 6ad044d7e..91e6ad75e 100644
--- a/tests/errors/bug627090.c-expected
+++ b/tests/errors/bug627090.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/errors/bug639589.c-expected b/tests/errors/bug639589.c-expected
index f3e3c8212..f129341e9 100644
--- a/tests/errors/bug639589.c-expected
+++ b/tests/errors/bug639589.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/errors/bug762377.c-expected b/tests/errors/bug762377.c-expected
index dfb878ef7..911d81e61 100644
--- a/tests/errors/bug762377.c-expected
+++ b/tests/errors/bug762377.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/errors/bug778224.c-expected b/tests/errors/bug778224.c-expected
index 1ebb8379a..f9d2d0063 100644
--- a/tests/errors/bug778224.c-expected
+++ b/tests/errors/bug778224.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/errors/catch-error-code.c-expected b/tests/errors/catch-error-code.c-expected
index 7fcd6f486..31b722cfd 100644
--- a/tests/errors/catch-error-code.c-expected
+++ b/tests/errors/catch-error-code.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/errors/catch-in-finally.c-expected b/tests/errors/catch-in-finally.c-expected
index fadaeed6d..da1a05707 100644
--- a/tests/errors/catch-in-finally.c-expected
+++ b/tests/errors/catch-in-finally.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/errors/default-gtype.c-expected b/tests/errors/default-gtype.c-expected
index d38b8aaf2..c3996c42d 100644
--- a/tests/errors/default-gtype.c-expected
+++ b/tests/errors/default-gtype.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/errors/delegate-throws-error-code.c-expected b/tests/errors/delegate-throws-error-code.c-expected
index fadfb48f8..8799e49ba 100644
--- a/tests/errors/delegate-throws-error-code.c-expected
+++ b/tests/errors/delegate-throws-error-code.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/errors/errorcode.c-expected b/tests/errors/errorcode.c-expected
index 1e25de2fb..196f82742 100644
--- a/tests/errors/errorcode.c-expected
+++ b/tests/errors/errorcode.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/errors/errordomain-static-method.c-expected b/tests/errors/errordomain-static-method.c-expected
index 070ee2e7c..03febe1e5 100644
--- a/tests/errors/errordomain-static-method.c-expected
+++ b/tests/errors/errordomain-static-method.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/errors/errordomain.c-expected b/tests/errors/errordomain.c-expected
index 51d8a1f06..17777ea6f 100644
--- a/tests/errors/errordomain.c-expected
+++ b/tests/errors/errordomain.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/errors/errors.c-expected b/tests/errors/errors.c-expected
index 25c46745a..c0c278a80 100644
--- a/tests/errors/errors.c-expected
+++ b/tests/errors/errors.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/errors/loops.c-expected b/tests/errors/loops.c-expected
index e42138013..93da0082b 100644
--- a/tests/errors/loops.c-expected
+++ b/tests/errors/loops.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/errors/method-throws-error-code.c-expected b/tests/errors/method-throws-error-code.c-expected
index dceef5dfb..e575f8bd4 100644
--- a/tests/errors/method-throws-error-code.c-expected
+++ b/tests/errors/method-throws-error-code.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/errors/method-throws.c-expected b/tests/errors/method-throws.c-expected
index 146c6bceb..59de8f571 100644
--- a/tests/errors/method-throws.c-expected
+++ b/tests/errors/method-throws.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/errors/unhandled.c-expected b/tests/errors/unhandled.c-expected
index deb2f7f3f..a3f7899bf 100644
--- a/tests/errors/unhandled.c-expected
+++ b/tests/errors/unhandled.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/generics/arrays.c-expected b/tests/generics/arrays.c-expected
index 157f22f42..d5d79c408 100644
--- a/tests/generics/arrays.c-expected
+++ b/tests/generics/arrays.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/generics/bug640330.c-expected b/tests/generics/bug640330.c-expected
index 71e1aa016..4b9d88858 100644
--- a/tests/generics/bug640330.c-expected
+++ b/tests/generics/bug640330.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/generics/bug694765-1.c-expected b/tests/generics/bug694765-1.c-expected
index 221bd42fc..3e7cf5faa 100644
--- a/tests/generics/bug694765-1.c-expected
+++ b/tests/generics/bug694765-1.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/generics/bug694765-2.c-expected b/tests/generics/bug694765-2.c-expected
index 1cf5dba06..72cfa6beb 100644
--- a/tests/generics/bug694765-2.c-expected
+++ b/tests/generics/bug694765-2.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/generics/constructor-chain-up.c-expected b/tests/generics/constructor-chain-up.c-expected
index 32a0cef02..16a840978 100644
--- a/tests/generics/constructor-chain-up.c-expected
+++ b/tests/generics/constructor-chain-up.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/generics/floating-type-cast.c-expected b/tests/generics/floating-type-cast.c-expected
index 405a376d9..8a5f03004 100644
--- a/tests/generics/floating-type-cast.c-expected
+++ b/tests/generics/floating-type-cast.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/generics/inference-argument-may-fail.c-expected b/tests/generics/inference-argument-may-fail.c-expected
index f4d91abd6..33b04fcd4 100644
--- a/tests/generics/inference-argument-may-fail.c-expected
+++ b/tests/generics/inference-argument-may-fail.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/generics/inference-static-function.c-expected b/tests/generics/inference-static-function.c-expected
index 25ac2348e..cbfa5d346 100644
--- a/tests/generics/inference-static-function.c-expected
+++ b/tests/generics/inference-static-function.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/generics/integer-member-access.c-expected b/tests/generics/integer-member-access.c-expected
index 19e803fa4..8099601b4 100644
--- a/tests/generics/integer-member-access.c-expected
+++ b/tests/generics/integer-member-access.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/generics/integer-type-cast-return.c-expected b/tests/generics/integer-type-cast-return.c-expected
index 47e1ae95c..0c381163c 100644
--- a/tests/generics/integer-type-cast-return.c-expected
+++ b/tests/generics/integer-type-cast-return.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/generics/integer-type-cast.c-expected b/tests/generics/integer-type-cast.c-expected
index 35f7fb6bc..cefe10251 100644
--- a/tests/generics/integer-type-cast.c-expected
+++ b/tests/generics/integer-type-cast.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/generics/member-dup-destroy.c-expected b/tests/generics/member-dup-destroy.c-expected
index aba13ad02..095a9c316 100644
--- a/tests/generics/member-dup-destroy.c-expected
+++ b/tests/generics/member-dup-destroy.c-expected
@@ -8,7 +8,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/generics/null-type.c-expected b/tests/generics/null-type.c-expected
index 3988e3609..b551aaffb 100644
--- a/tests/generics/null-type.c-expected
+++ b/tests/generics/null-type.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/generics/parameter-sizeof-initializer.c-expected b/tests/generics/parameter-sizeof-initializer.c-expected
index cd21eb8d0..4415f200a 100644
--- a/tests/generics/parameter-sizeof-initializer.c-expected
+++ b/tests/generics/parameter-sizeof-initializer.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/generics/property-gobject-set.c-expected b/tests/generics/property-gobject-set.c-expected
index 8308f85a8..87e701398 100644
--- a/tests/generics/property-gobject-set.c-expected
+++ b/tests/generics/property-gobject-set.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/generics/property-int-cast.c-expected b/tests/generics/property-int-cast.c-expected
index b2708305a..f299ff779 100644
--- a/tests/generics/property-int-cast.c-expected
+++ b/tests/generics/property-int-cast.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/generics/reference-transfer.c-expected b/tests/generics/reference-transfer.c-expected
index e3818a195..e8147d5c3 100644
--- a/tests/generics/reference-transfer.c-expected
+++ b/tests/generics/reference-transfer.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/generics/string-literal-comparison.c-expected b/tests/generics/string-literal-comparison.c-expected
index 4a4222f22..c3ad9155d 100644
--- a/tests/generics/string-literal-comparison.c-expected
+++ b/tests/generics/string-literal-comparison.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/generics/type-parameter-properties.c-expected b/tests/generics/type-parameter-properties.c-expected
index 263c957a3..2fcf2400d 100644
--- a/tests/generics/type-parameter-properties.c-expected
+++ b/tests/generics/type-parameter-properties.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/generics/type-parameter-property-clash.c-expected b/tests/generics/type-parameter-property-clash.c-expected
index 1f849dfdb..11797d91f 100644
--- a/tests/generics/type-parameter-property-clash.c-expected
+++ b/tests/generics/type-parameter-property-clash.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/generics/value-pointer-type-access.c-expected b/tests/generics/value-pointer-type-access.c-expected
index e98d7fa45..bbca4aa49 100644
--- a/tests/generics/value-pointer-type-access.c-expected
+++ b/tests/generics/value-pointer-type-access.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/genie/class-abstract.c-expected b/tests/genie/class-abstract.c-expected
index 68b860a53..6fb1f1829 100644
--- a/tests/genie/class-abstract.c-expected
+++ b/tests/genie/class-abstract.c-expected
@@ -9,7 +9,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/genie/class-field.c-expected b/tests/genie/class-field.c-expected
index 18dbc12b5..5c6340d3c 100644
--- a/tests/genie/class-field.c-expected
+++ b/tests/genie/class-field.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/genie/class-init.c-expected b/tests/genie/class-init.c-expected
index b0cf044bb..67a1a50a3 100644
--- a/tests/genie/class-init.c-expected
+++ b/tests/genie/class-init.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/genie/class-property.c-expected b/tests/genie/class-property.c-expected
index f936f2f7d..3f1f8e28f 100644
--- a/tests/genie/class-property.c-expected
+++ b/tests/genie/class-property.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/genie/class-signal.c-expected b/tests/genie/class-signal.c-expected
index 281b12fdf..10dee0a5d 100644
--- a/tests/genie/class-signal.c-expected
+++ b/tests/genie/class-signal.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/genie/class.c-expected b/tests/genie/class.c-expected
index f202bc5de..9019c50b8 100644
--- a/tests/genie/class.c-expected
+++ b/tests/genie/class.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/genie/enum-with-keyword-values.c-expected b/tests/genie/enum-with-keyword-values.c-expected
index 73251008d..d4521d6be 100644
--- a/tests/genie/enum-with-keyword-values.c-expected
+++ b/tests/genie/enum-with-keyword-values.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/genie/enum.c-expected b/tests/genie/enum.c-expected
index 4e82a099d..28034f802 100644
--- a/tests/genie/enum.c-expected
+++ b/tests/genie/enum.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/genie/exception.c-expected b/tests/genie/exception.c-expected
index d75111d7f..686c1d930 100644
--- a/tests/genie/exception.c-expected
+++ b/tests/genie/exception.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/genie/function-returns-closure.c-expected b/tests/genie/function-returns-closure.c-expected
index d3e148330..e77659a08 100644
--- a/tests/genie/function-returns-closure.c-expected
+++ b/tests/genie/function-returns-closure.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/genie/function-with-argument.c-expected b/tests/genie/function-with-argument.c-expected
index fc6293b79..6af0fdc3a 100644
--- a/tests/genie/function-with-argument.c-expected
+++ b/tests/genie/function-with-argument.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/genie/function-with-return-value.c-expected b/tests/genie/function-with-return-value.c-expected
index 15b6a8109..128366589 100644
--- a/tests/genie/function-with-return-value.c-expected
+++ b/tests/genie/function-with-return-value.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/genie/function.c-expected b/tests/genie/function.c-expected
index f3955085d..bc2baf114 100644
--- a/tests/genie/function.c-expected
+++ b/tests/genie/function.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/genie/interface.c-expected b/tests/genie/interface.c-expected
index 3a8087f1a..4f74d6efc 100644
--- a/tests/genie/interface.c-expected
+++ b/tests/genie/interface.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/genie/literal-template-string.c-expected b/tests/genie/literal-template-string.c-expected
index 0333b8546..8d0a09921 100644
--- a/tests/genie/literal-template-string.c-expected
+++ b/tests/genie/literal-template-string.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/genie/struct-after-class.c-expected b/tests/genie/struct-after-class.c-expected
index 7047db9ad..ba46da8a8 100644
--- a/tests/genie/struct-after-class.c-expected
+++ b/tests/genie/struct-after-class.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/genie/struct.c-expected b/tests/genie/struct.c-expected
index 9d4e4cb50..015fa4b5a 100644
--- a/tests/genie/struct.c-expected
+++ b/tests/genie/struct.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/genie/try-except-finally.c-expected b/tests/genie/try-except-finally.c-expected
index 4c945480d..cad8905c0 100644
--- a/tests/genie/try-except-finally.c-expected
+++ b/tests/genie/try-except-finally.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/genie/verbatim-template.c-expected b/tests/genie/verbatim-template.c-expected
index 97531c04f..192584fcd 100644
--- a/tests/genie/verbatim-template.c-expected
+++ b/tests/genie/verbatim-template.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/methods/argument-array-initilizer.c-expected b/tests/methods/argument-array-initilizer.c-expected
index 9fb7a9ab0..13153ed10 100644
--- a/tests/methods/argument-array-initilizer.c-expected
+++ b/tests/methods/argument-array-initilizer.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/methods/argument-named.c-expected b/tests/methods/argument-named.c-expected
index ae239b7f1..8d101118b 100644
--- a/tests/methods/argument-named.c-expected
+++ b/tests/methods/argument-named.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/methods/array-length-type.c-expected b/tests/methods/array-length-type.c-expected
index 85f9ab80b..1f9c4e213 100644
--- a/tests/methods/array-length-type.c-expected
+++ b/tests/methods/array-length-type.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/methods/bug540483.c-expected b/tests/methods/bug540483.c-expected
index 5dc573fbe..0c09c8bd1 100644
--- a/tests/methods/bug540483.c-expected
+++ b/tests/methods/bug540483.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/methods/bug595538.c-expected b/tests/methods/bug595538.c-expected
index 4cca222a1..a284d27d0 100644
--- a/tests/methods/bug595538.c-expected
+++ b/tests/methods/bug595538.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/methods/bug596726.c-expected b/tests/methods/bug596726.c-expected
index 6fa956d62..c49f5b33d 100644
--- a/tests/methods/bug596726.c-expected
+++ b/tests/methods/bug596726.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/methods/bug597426.c-expected b/tests/methods/bug597426.c-expected
index f13a81057..da0241078 100644
--- a/tests/methods/bug597426.c-expected
+++ b/tests/methods/bug597426.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/methods/bug599892.c-expected b/tests/methods/bug599892.c-expected
index ea79e50fa..bdb503175 100644
--- a/tests/methods/bug599892.c-expected
+++ b/tests/methods/bug599892.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/methods/bug613483.c-expected b/tests/methods/bug613483.c-expected
index 77c03269e..991f22a14 100644
--- a/tests/methods/bug613483.c-expected
+++ b/tests/methods/bug613483.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/methods/bug620673.c-expected b/tests/methods/bug620673.c-expected
index 248cfcef0..339b7d26c 100644
--- a/tests/methods/bug620673.c-expected
+++ b/tests/methods/bug620673.c-expected
@@ -7,7 +7,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/methods/bug626783.c-expected b/tests/methods/bug626783.c-expected
index 4038dc962..9a7b1a4a1 100644
--- a/tests/methods/bug626783.c-expected
+++ b/tests/methods/bug626783.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/methods/bug634753.c-expected b/tests/methods/bug634753.c-expected
index e6398fe2e..0c1a46b44 100644
--- a/tests/methods/bug634753.c-expected
+++ b/tests/methods/bug634753.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/methods/bug639054.c-expected b/tests/methods/bug639054.c-expected
index 4429c8ebb..b62b6f555 100644
--- a/tests/methods/bug639054.c-expected
+++ b/tests/methods/bug639054.c-expected
@@ -8,7 +8,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/methods/bug642350.c-expected b/tests/methods/bug642350.c-expected
index 1048cb4b2..acfba970b 100644
--- a/tests/methods/bug642350.c-expected
+++ b/tests/methods/bug642350.c-expected
@@ -9,7 +9,7 @@
#define BAZ N_ ("bar")
#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/methods/bug642885.c-expected b/tests/methods/bug642885.c-expected
index 6b093eb1d..ce1201eb5 100644
--- a/tests/methods/bug642885.c-expected
+++ b/tests/methods/bug642885.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/methods/bug642899.c-expected b/tests/methods/bug642899.c-expected
index e95bb0f14..1b4aecd1c 100644
--- a/tests/methods/bug642899.c-expected
+++ b/tests/methods/bug642899.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/methods/bug648320.c-expected b/tests/methods/bug648320.c-expected
index 4026eba9d..ea27691df 100644
--- a/tests/methods/bug648320.c-expected
+++ b/tests/methods/bug648320.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/methods/bug652098.c-expected b/tests/methods/bug652098.c-expected
index 871617da4..fc08c0172 100644
--- a/tests/methods/bug652098.c-expected
+++ b/tests/methods/bug652098.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/methods/bug653391.c-expected b/tests/methods/bug653391.c-expected
index 1f9c89ea6..d6bee4d8b 100644
--- a/tests/methods/bug653391.c-expected
+++ b/tests/methods/bug653391.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/methods/bug653908.c-expected b/tests/methods/bug653908.c-expected
index 891aacdc3..cac0f7554 100644
--- a/tests/methods/bug653908.c-expected
+++ b/tests/methods/bug653908.c-expected
@@ -5,7 +5,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/methods/bug663210.c-expected b/tests/methods/bug663210.c-expected
index d248a449f..ae6b2a7df 100644
--- a/tests/methods/bug663210.c-expected
+++ b/tests/methods/bug663210.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/methods/bug699956.c-expected b/tests/methods/bug699956.c-expected
index b8b789c11..e44fb7c25 100644
--- a/tests/methods/bug699956.c-expected
+++ b/tests/methods/bug699956.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/methods/bug710862.c-expected b/tests/methods/bug710862.c-expected
index a5a54036b..e2508f32d 100644
--- a/tests/methods/bug710862.c-expected
+++ b/tests/methods/bug710862.c-expected
@@ -8,7 +8,7 @@
#include <stdarg.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/methods/bug723009.c-expected b/tests/methods/bug723009.c-expected
index f7376c656..3b0222729 100644
--- a/tests/methods/bug723009.c-expected
+++ b/tests/methods/bug723009.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/methods/bug726347.c-expected b/tests/methods/bug726347.c-expected
index 84681feb5..107b42db1 100644
--- a/tests/methods/bug726347.c-expected
+++ b/tests/methods/bug726347.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/methods/bug736235.c-expected b/tests/methods/bug736235.c-expected
index 5f65d8936..4d1cbe5f4 100644
--- a/tests/methods/bug736235.c-expected
+++ b/tests/methods/bug736235.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/methods/bug737222.c-expected b/tests/methods/bug737222.c-expected
index c79c0cd51..7e8f3892b 100644
--- a/tests/methods/bug737222.c-expected
+++ b/tests/methods/bug737222.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/methods/bug771964.c-expected b/tests/methods/bug771964.c-expected
index 74f16bb9a..c827c576d 100644
--- a/tests/methods/bug771964.c-expected
+++ b/tests/methods/bug771964.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/methods/bug774060.c-expected b/tests/methods/bug774060.c-expected
index 367b76b79..923ddcd97 100644
--- a/tests/methods/bug774060.c-expected
+++ b/tests/methods/bug774060.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/methods/bug781061.c-expected b/tests/methods/bug781061.c-expected
index 352fa1e2f..164c13bf3 100644
--- a/tests/methods/bug781061.c-expected
+++ b/tests/methods/bug781061.c-expected
@@ -8,7 +8,7 @@
#include <stdarg.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/methods/bug784691.c-expected b/tests/methods/bug784691.c-expected
index 7c7ccccec..a145c0c91 100644
--- a/tests/methods/bug784691.c-expected
+++ b/tests/methods/bug784691.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/methods/bug791215.c-expected b/tests/methods/bug791215.c-expected
index 69066096a..bce9816a8 100644
--- a/tests/methods/bug791215.c-expected
+++ b/tests/methods/bug791215.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/methods/bug791283.c-expected b/tests/methods/bug791283.c-expected
index 30d862fdf..862054a26 100644
--- a/tests/methods/bug791283.c-expected
+++ b/tests/methods/bug791283.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/methods/closures.c-expected b/tests/methods/closures.c-expected
index baafa40d9..91b001d8e 100644
--- a/tests/methods/closures.c-expected
+++ b/tests/methods/closures.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/methods/contains.c-expected b/tests/methods/contains.c-expected
index 38ce0855d..e406bc6b1 100644
--- a/tests/methods/contains.c-expected
+++ b/tests/methods/contains.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/methods/delegate-target.c-expected b/tests/methods/delegate-target.c-expected
index f1c6add6c..8284c6173 100644
--- a/tests/methods/delegate-target.c-expected
+++ b/tests/methods/delegate-target.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/methods/extern.c-expected b/tests/methods/extern.c-expected
index e8877a601..930a20de5 100644
--- a/tests/methods/extern.c-expected
+++ b/tests/methods/extern.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/methods/generics.c-expected b/tests/methods/generics.c-expected
index 8cc76765b..dffd02204 100644
--- a/tests/methods/generics.c-expected
+++ b/tests/methods/generics.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/methods/iterator.c-expected b/tests/methods/iterator.c-expected
index 9f20bc38a..fdd1eb81c 100644
--- a/tests/methods/iterator.c-expected
+++ b/tests/methods/iterator.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/methods/lambda.c-expected b/tests/methods/lambda.c-expected
index 2eaa62642..7e9538a61 100644
--- a/tests/methods/lambda.c-expected
+++ b/tests/methods/lambda.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/methods/nowrapper-interface.c-expected b/tests/methods/nowrapper-interface.c-expected
index 92cf1c1e7..abc0ce6f5 100644
--- a/tests/methods/nowrapper-interface.c-expected
+++ b/tests/methods/nowrapper-interface.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/methods/parameter-ccode-type.c-expected b/tests/methods/parameter-ccode-type.c-expected
index 1718ba5dc..cf061bb96 100644
--- a/tests/methods/parameter-ccode-type.c-expected
+++ b/tests/methods/parameter-ccode-type.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/methods/parameter-fixed-array-initializer.c-expected b/tests/methods/parameter-fixed-array-initializer.c-expected
index b940fab63..f7477708c 100644
--- a/tests/methods/parameter-fixed-array-initializer.c-expected
+++ b/tests/methods/parameter-fixed-array-initializer.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/methods/parameter-out-free-on-error.c-expected b/tests/methods/parameter-out-free-on-error.c-expected
index 18e4fcc18..47db7df6c 100644
--- a/tests/methods/parameter-out-free-on-error.c-expected
+++ b/tests/methods/parameter-out-free-on-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/methods/parameter-ref-array-resize-captured.c-expected b/tests/methods/parameter-ref-array-resize-captured.c-expected
index 2b06a3a23..2e8550d81 100644
--- a/tests/methods/parameter-ref-array-resize-captured.c-expected
+++ b/tests/methods/parameter-ref-array-resize-captured.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/methods/parameter-ref-array-resize.c-expected b/tests/methods/parameter-ref-array-resize.c-expected
index ece83e988..1396e7d52 100644
--- a/tests/methods/parameter-ref-array-resize.c-expected
+++ b/tests/methods/parameter-ref-array-resize.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/methods/parameter-ref-delegate.c-expected b/tests/methods/parameter-ref-delegate.c-expected
index dafddddf6..2ee6601f5 100644
--- a/tests/methods/parameter-ref-delegate.c-expected
+++ b/tests/methods/parameter-ref-delegate.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/methods/parameter-ref-element-access.c-expected b/tests/methods/parameter-ref-element-access.c-expected
index e87761df9..80faed632 100644
--- a/tests/methods/parameter-ref-element-access.c-expected
+++ b/tests/methods/parameter-ref-element-access.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/methods/params-array-with-throws.c-expected b/tests/methods/params-array-with-throws.c-expected
index 0d25797cc..0a51e6d36 100644
--- a/tests/methods/params-array-with-throws.c-expected
+++ b/tests/methods/params-array-with-throws.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/methods/params-array.c-expected b/tests/methods/params-array.c-expected
index 00cd25a25..8763ceca9 100644
--- a/tests/methods/params-array.c-expected
+++ b/tests/methods/params-array.c-expected
@@ -10,7 +10,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/methods/postconditions-temp-variables.c-expected b/tests/methods/postconditions-temp-variables.c-expected
index fbc76445f..9f188fb16 100644
--- a/tests/methods/postconditions-temp-variables.c-expected
+++ b/tests/methods/postconditions-temp-variables.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/methods/postconditions.c-expected b/tests/methods/postconditions.c-expected
index f577e535d..b288109b4 100644
--- a/tests/methods/postconditions.c-expected
+++ b/tests/methods/postconditions.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/methods/preconditions-temp-variables.c-expected b/tests/methods/preconditions-temp-variables.c-expected
index 25d4267b3..f9431b828 100644
--- a/tests/methods/preconditions-temp-variables.c-expected
+++ b/tests/methods/preconditions-temp-variables.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/methods/prepostconditions-captured.c-expected b/tests/methods/prepostconditions-captured.c-expected
index 7d8484f55..32b10d05d 100644
--- a/tests/methods/prepostconditions-captured.c-expected
+++ b/tests/methods/prepostconditions-captured.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/methods/prepostconditions-contains.c-expected b/tests/methods/prepostconditions-contains.c-expected
index 5409cd218..67361fd1a 100644
--- a/tests/methods/prepostconditions-contains.c-expected
+++ b/tests/methods/prepostconditions-contains.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/methods/prepostconditions.c-expected b/tests/methods/prepostconditions.c-expected
index b99174516..d4007bb24 100644
--- a/tests/methods/prepostconditions.c-expected
+++ b/tests/methods/prepostconditions.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/methods/print-attribute.c-expected b/tests/methods/print-attribute.c-expected
index d3b9ae59e..5dc66e9a0 100644
--- a/tests/methods/print-attribute.c-expected
+++ b/tests/methods/print-attribute.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/methods/profile.c-expected b/tests/methods/profile.c-expected
index 9a0bba52b..1cd149e43 100644
--- a/tests/methods/profile.c-expected
+++ b/tests/methods/profile.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/methods/return-unowned-delegate.c-expected b/tests/methods/return-unowned-delegate.c-expected
index 96904ba1e..d99c1ab3a 100644
--- a/tests/methods/return-unowned-delegate.c-expected
+++ b/tests/methods/return-unowned-delegate.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/methods/same-name.c-expected b/tests/methods/same-name.c-expected
index e68b4f3d2..e95dfb140 100644
--- a/tests/methods/same-name.c-expected
+++ b/tests/methods/same-name.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/methods/symbolresolution.c-expected b/tests/methods/symbolresolution.c-expected
index 301a18c58..0e004086c 100644
--- a/tests/methods/symbolresolution.c-expected
+++ b/tests/methods/symbolresolution.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/methods/varargs-delegate-without-target.c-expected b/tests/methods/varargs-delegate-without-target.c-expected
index 5b8caa481..7b121309d 100644
--- a/tests/methods/varargs-delegate-without-target.c-expected
+++ b/tests/methods/varargs-delegate-without-target.c-expected
@@ -7,7 +7,7 @@
#include <stdarg.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/methods/varargs-delegate.c-expected b/tests/methods/varargs-delegate.c-expected
index 2a20d4e15..d54618f71 100644
--- a/tests/methods/varargs-delegate.c-expected
+++ b/tests/methods/varargs-delegate.c-expected
@@ -7,7 +7,7 @@
#include <stdarg.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/methods/varargs-gvalue.c-expected b/tests/methods/varargs-gvalue.c-expected
index 5c5d26a69..66dd05fbe 100644
--- a/tests/methods/varargs-gvalue.c-expected
+++ b/tests/methods/varargs-gvalue.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/methods/varargs-out.c-expected b/tests/methods/varargs-out.c-expected
index 35e5ef5eb..9965ea72d 100644
--- a/tests/methods/varargs-out.c-expected
+++ b/tests/methods/varargs-out.c-expected
@@ -8,7 +8,7 @@
#include <stdarg.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/methods/varargs-ref.c-expected b/tests/methods/varargs-ref.c-expected
index cc68f4ab7..d1ba64668 100644
--- a/tests/methods/varargs-ref.c-expected
+++ b/tests/methods/varargs-ref.c-expected
@@ -7,7 +7,7 @@
#include <stdarg.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/methods/varargs-struct.c-expected b/tests/methods/varargs-struct.c-expected
index 5b6e85af9..d514fe8bd 100644
--- a/tests/methods/varargs-struct.c-expected
+++ b/tests/methods/varargs-struct.c-expected
@@ -6,7 +6,7 @@
#include <stdarg.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/namespace/unique.c-expected b/tests/namespace/unique.c-expected
index 102796fd0..c954c9734 100644
--- a/tests/namespace/unique.c-expected
+++ b/tests/namespace/unique.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/nullability/member-access-narrowed-instance.c-expected b/tests/nullability/member-access-narrowed-instance.c-expected
index 4f4051bc1..fc290154d 100644
--- a/tests/nullability/member-access-narrowed-instance.c-expected
+++ b/tests/nullability/member-access-narrowed-instance.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/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
diff --git a/tests/ordering/constant-class.c-expected b/tests/ordering/constant-class.c-expected
index c6ce5c234..02fa6f709 100644
--- a/tests/ordering/constant-class.c-expected
+++ b/tests/ordering/constant-class.c-expected
@@ -7,7 +7,7 @@
#define FOO 42
#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/ordering/constant-enum.c-expected b/tests/ordering/constant-enum.c-expected
index d21a63354..bd3af4dc5 100644
--- a/tests/ordering/constant-enum.c-expected
+++ b/tests/ordering/constant-enum.c-expected
@@ -6,7 +6,7 @@
#define FOO 42
#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/ordering/constant-field.c-expected b/tests/ordering/constant-field.c-expected
index ffc093b52..0a8cc0a1b 100644
--- a/tests/ordering/constant-field.c-expected
+++ b/tests/ordering/constant-field.c-expected
@@ -5,7 +5,7 @@
#define FOO 42
#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/ordering/constant-struct.c-expected b/tests/ordering/constant-struct.c-expected
index 79d558cfc..be0fa6d2a 100644
--- a/tests/ordering/constant-struct.c-expected
+++ b/tests/ordering/constant-struct.c-expected
@@ -7,7 +7,7 @@
#define FOO 42
#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/ordering/delegate-class.c-expected b/tests/ordering/delegate-class.c-expected
index d128ee437..ccf8cf703 100644
--- a/tests/ordering/delegate-class.c-expected
+++ b/tests/ordering/delegate-class.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/ordering/delegate-enum.c-expected b/tests/ordering/delegate-enum.c-expected
index 08c0cadf7..2f6fed192 100644
--- a/tests/ordering/delegate-enum.c-expected
+++ b/tests/ordering/delegate-enum.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/ordering/delegate-interface.c-expected b/tests/ordering/delegate-interface.c-expected
index eb971637c..4f2c39be0 100644
--- a/tests/ordering/delegate-interface.c-expected
+++ b/tests/ordering/delegate-interface.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/ordering/delegate-struct.c-expected b/tests/ordering/delegate-struct.c-expected
index b4630c7de..5dd3c45a1 100644
--- a/tests/ordering/delegate-struct.c-expected
+++ b/tests/ordering/delegate-struct.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/ordering/struct-delegate.c-expected b/tests/ordering/struct-delegate.c-expected
index c2a0932e8..74276637f 100644
--- a/tests/ordering/struct-delegate.c-expected
+++ b/tests/ordering/struct-delegate.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/parser-keep-going/member-initializer.c-expected b/tests/parser-keep-going/member-initializer.c-expected
index 912b045c9..6efe582a7 100644
--- a/tests/parser-keep-going/member-initializer.c-expected
+++ b/tests/parser-keep-going/member-initializer.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/parser/array-length.c-expected b/tests/parser/array-length.c-expected
index 9ef0f8f97..b2232e20f 100644
--- a/tests/parser/array-length.c-expected
+++ b/tests/parser/array-length.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/parser/field-multi-one-line.c-expected b/tests/parser/field-multi-one-line.c-expected
index a13e55061..be930a442 100644
--- a/tests/parser/field-multi-one-line.c-expected
+++ b/tests/parser/field-multi-one-line.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/parser/lock-statement.c-expected b/tests/parser/lock-statement.c-expected
index 6deb21ef3..89bffce0e 100644
--- a/tests/parser/lock-statement.c-expected
+++ b/tests/parser/lock-statement.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/parser/member-access-pointer.c-expected b/tests/parser/member-access-pointer.c-expected
index af66c6eff..cc2e60959 100644
--- a/tests/parser/member-access-pointer.c-expected
+++ b/tests/parser/member-access-pointer.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/parser/member-initializer-empty.c-expected b/tests/parser/member-initializer-empty.c-expected
index 6e82e37fd..0c17048b3 100644
--- a/tests/parser/member-initializer-empty.c-expected
+++ b/tests/parser/member-initializer-empty.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/parser/member-initializer-trailing-comma.c-expected b/tests/parser/member-initializer-trailing-comma.c-expected
index 70c745aec..f4922a4d5 100644
--- a/tests/parser/member-initializer-trailing-comma.c-expected
+++ b/tests/parser/member-initializer-trailing-comma.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/parser/member-initializer.c-expected b/tests/parser/member-initializer.c-expected
index 2b018ebf6..7c4d98cd5 100644
--- a/tests/parser/member-initializer.c-expected
+++ b/tests/parser/member-initializer.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/parser/namespaces.c-expected b/tests/parser/namespaces.c-expected
index 36cfb4b90..191234cc5 100644
--- a/tests/parser/namespaces.c-expected
+++ b/tests/parser/namespaces.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/parser/qualified-member-access.c-expected b/tests/parser/qualified-member-access.c-expected
index c18b53b06..4aee4f386 100644
--- a/tests/parser/qualified-member-access.c-expected
+++ b/tests/parser/qualified-member-access.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/parser/qualified-symbol-access.c-expected b/tests/parser/qualified-symbol-access.c-expected
index 824787809..1346b7bc4 100644
--- a/tests/parser/qualified-symbol-access.c-expected
+++ b/tests/parser/qualified-symbol-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/parser/sealed-class.c-expected b/tests/parser/sealed-class.c-expected
index c8b4dca91..e92739022 100644
--- a/tests/parser/sealed-class.c-expected
+++ b/tests/parser/sealed-class.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/parser/switch-statement.c-expected b/tests/parser/switch-statement.c-expected
index b1715aab2..cd97a5027 100644
--- a/tests/parser/switch-statement.c-expected
+++ b/tests/parser/switch-statement.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/parser/template.c-expected b/tests/parser/template.c-expected
index 093acfe15..04f68bced 100644
--- a/tests/parser/template.c-expected
+++ b/tests/parser/template.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/parser/using-directive.c-expected b/tests/parser/using-directive.c-expected
index 1f10b8863..8289a788f 100644
--- a/tests/parser/using-directive.c-expected
+++ b/tests/parser/using-directive.c-expected
@@ -2,7 +2,7 @@
* generated from parser_using_directive.vala, do not modify */
#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/parser/var-type-dynamic.c-expected b/tests/parser/var-type-dynamic.c-expected
index 75eaaae57..9411215b9 100644
--- a/tests/parser/var-type-dynamic.c-expected
+++ b/tests/parser/var-type-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/parser/verbatim-template.c-expected b/tests/parser/verbatim-template.c-expected
index 108cae7c5..dd28f0121 100644
--- a/tests/parser/verbatim-template.c-expected
+++ b/tests/parser/verbatim-template.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/parser/yield-return.c-expected b/tests/parser/yield-return.c-expected
index 11a23c41e..24c3f1288 100644
--- a/tests/parser/yield-return.c-expected
+++ b/tests/parser/yield-return.c-expected
@@ -9,7 +9,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/pointers/bug590641.c-expected b/tests/pointers/bug590641.c-expected
index ec0d96a3c..fd392bde6 100644
--- a/tests/pointers/bug590641.c-expected
+++ b/tests/pointers/bug590641.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/pointers/delete.c-expected b/tests/pointers/delete.c-expected
index f0652e561..133f15ea9 100644
--- a/tests/pointers/delete.c-expected
+++ b/tests/pointers/delete.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/posix/arrays.c-expected b/tests/posix/arrays.c-expected
index b59712f6b..2024da37b 100644
--- a/tests/posix/arrays.c-expected
+++ b/tests/posix/arrays.c-expected
@@ -10,7 +10,7 @@
#define FOO 2
#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/posix/empty-length-0.c-expected b/tests/posix/empty-length-0.c-expected
index b11d450f3..a4cff61a0 100644
--- a/tests/posix/empty-length-0.c-expected
+++ b/tests/posix/empty-length-0.c-expected
@@ -8,7 +8,7 @@
#include <assert.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/posix/string-concat.c-expected b/tests/posix/string-concat.c-expected
index 5c9e3b301..686f5d8b4 100644
--- a/tests/posix/string-concat.c-expected
+++ b/tests/posix/string-concat.c-expected
@@ -7,7 +7,7 @@
#include <assert.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/posix/struct_only.c-expected b/tests/posix/struct_only.c-expected
index da17479a4..5553db83c 100644
--- a/tests/posix/struct_only.c-expected
+++ b/tests/posix/struct_only.c-expected
@@ -5,7 +5,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/resolver/peek-inner-types.c-expected b/tests/resolver/peek-inner-types.c-expected
index 11a862f44..91fbd58f0 100644
--- a/tests/resolver/peek-inner-types.c-expected
+++ b/tests/resolver/peek-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/semantic/assignment-element-getter-setter.c-expected b/tests/semantic/assignment-element-getter-setter.c-expected
index b0abb879d..b7afe7695 100644
--- a/tests/semantic/assignment-element-getter-setter.c-expected
+++ b/tests/semantic/assignment-element-getter-setter.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/semantic/assignment-same-variable.c-expected b/tests/semantic/assignment-same-variable.c-expected
index 8fa29a4b4..94653ce69 100644
--- a/tests/semantic/assignment-same-variable.c-expected
+++ b/tests/semantic/assignment-same-variable.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/semantic/class-opaque-automatic-property.c-expected b/tests/semantic/class-opaque-automatic-property.c-expected
index fbb7cb85c..2f99fa220 100644
--- a/tests/semantic/class-opaque-automatic-property.c-expected
+++ b/tests/semantic/class-opaque-automatic-property.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/semantic/class-opaque.c-expected b/tests/semantic/class-opaque.c-expected
index 0a1252961..e676e03c5 100644
--- a/tests/semantic/class-opaque.c-expected
+++ b/tests/semantic/class-opaque.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/semantic/compare-type-check.c-expected b/tests/semantic/compare-type-check.c-expected
index 61bb0da0b..6ce4702fd 100644
--- a/tests/semantic/compare-type-check.c-expected
+++ b/tests/semantic/compare-type-check.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/semantic/field-constant.c-expected b/tests/semantic/field-constant.c-expected
index 84d863ea1..6e5b1b30d 100644
--- a/tests/semantic/field-constant.c-expected
+++ b/tests/semantic/field-constant.c-expected
@@ -6,7 +6,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/semantic/floating-reference-base-method.c-expected b/tests/semantic/floating-reference-base-method.c-expected
index 77d97147b..636be9472 100644
--- a/tests/semantic/floating-reference-base-method.c-expected
+++ b/tests/semantic/floating-reference-base-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/semantic/floating-reference-error.c-expected b/tests/semantic/floating-reference-error.c-expected
index 5e582f5db..6b36da585 100644
--- a/tests/semantic/floating-reference-error.c-expected
+++ b/tests/semantic/floating-reference-error.c-expected
@@ -5,7 +5,7 @@
#include <stdarg.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/semantic/floating-reference.c-expected b/tests/semantic/floating-reference.c-expected
index 685f20108..fcacfae82 100644
--- a/tests/semantic/floating-reference.c-expected
+++ b/tests/semantic/floating-reference.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/semantic/localvariable-var-pointer-initializer.c-expected b/tests/semantic/localvariable-var-pointer-initializer.c-expected
index 4b9b4c009..763ad18ea 100644
--- a/tests/semantic/localvariable-var-pointer-initializer.c-expected
+++ b/tests/semantic/localvariable-var-pointer-initializer.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/semantic/member-access-static-transformed-qualified.c-expected b/tests/semantic/member-access-static-transformed-qualified.c-expected
index d81553866..1e6a8c569 100644
--- a/tests/semantic/member-access-static-transformed-qualified.c-expected
+++ b/tests/semantic/member-access-static-transformed-qualified.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/semantic/member-access-static-with-instance.c-expected b/tests/semantic/member-access-static-with-instance.c-expected
index fc27197c9..3c0f2e1f4 100644
--- a/tests/semantic/member-access-static-with-instance.c-expected
+++ b/tests/semantic/member-access-static-with-instance.c-expected
@@ -8,7 +8,7 @@
#define FOO_FOO 23
#define BAR FOO_FOO
#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/semantic/member-access-transformed-qualified.c-expected b/tests/semantic/member-access-transformed-qualified.c-expected
index 5b26dfc66..c978f6db5 100644
--- a/tests/semantic/member-access-transformed-qualified.c-expected
+++ b/tests/semantic/member-access-transformed-qualified.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/semantic/with-compact.c-expected b/tests/semantic/with-compact.c-expected
index aa892e239..d7a789348 100644
--- a/tests/semantic/with-compact.c-expected
+++ b/tests/semantic/with-compact.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/semantic/with-declaration-cast-type.c-expected b/tests/semantic/with-declaration-cast-type.c-expected
index 497e40268..8692d6fcf 100644
--- a/tests/semantic/with-declaration-cast-type.c-expected
+++ b/tests/semantic/with-declaration-cast-type.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/semantic/with-declaration.c-expected b/tests/semantic/with-declaration.c-expected
index 3f0957f05..1841d9554 100644
--- a/tests/semantic/with-declaration.c-expected
+++ b/tests/semantic/with-declaration.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/semantic/with-dereferenced-pointer.c-expected b/tests/semantic/with-dereferenced-pointer.c-expected
index 1faf737e2..507dd8ba8 100644
--- a/tests/semantic/with-dereferenced-pointer.c-expected
+++ b/tests/semantic/with-dereferenced-pointer.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/semantic/with-enum-member.c-expected b/tests/semantic/with-enum-member.c-expected
index d7347f70b..b5f0d74ee 100644
--- a/tests/semantic/with-enum-member.c-expected
+++ b/tests/semantic/with-enum-member.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/semantic/with-null.c-expected b/tests/semantic/with-null.c-expected
index 0d5488110..875c36c69 100644
--- a/tests/semantic/with-null.c-expected
+++ b/tests/semantic/with-null.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/structs/bug530605.c-expected b/tests/structs/bug530605.c-expected
index ad65d7af3..412e8674c 100644
--- a/tests/structs/bug530605.c-expected
+++ b/tests/structs/bug530605.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/structs/bug572091.c-expected b/tests/structs/bug572091.c-expected
index 8046ad9b7..35ac934b8 100644
--- a/tests/structs/bug572091.c-expected
+++ b/tests/structs/bug572091.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/structs/bug583603.c-expected b/tests/structs/bug583603.c-expected
index 8bbabae59..1b6345a81 100644
--- a/tests/structs/bug583603.c-expected
+++ b/tests/structs/bug583603.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/structs/bug595587.c-expected b/tests/structs/bug595587.c-expected
index 3d5f56781..9018c873d 100644
--- a/tests/structs/bug595587.c-expected
+++ b/tests/structs/bug595587.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/structs/bug596144.c-expected b/tests/structs/bug596144.c-expected
index deb852946..87590a05e 100644
--- a/tests/structs/bug596144.c-expected
+++ b/tests/structs/bug596144.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/structs/bug603056.c-expected b/tests/structs/bug603056.c-expected
index 7530689b9..34749b248 100644
--- a/tests/structs/bug603056.c-expected
+++ b/tests/structs/bug603056.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/structs/bug606202.c-expected b/tests/structs/bug606202.c-expected
index 9bfe67888..d6c96053e 100644
--- a/tests/structs/bug606202.c-expected
+++ b/tests/structs/bug606202.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/structs/bug609642.c-expected b/tests/structs/bug609642.c-expected
index 9f5e0a43a..6d5d43744 100644
--- a/tests/structs/bug609642.c-expected
+++ b/tests/structs/bug609642.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/structs/bug613513.c-expected b/tests/structs/bug613513.c-expected
index f0af93b38..c48ad8b83 100644
--- a/tests/structs/bug613513.c-expected
+++ b/tests/structs/bug613513.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/structs/bug613825.c-expected b/tests/structs/bug613825.c-expected
index fd6775b9d..b32aaad50 100644
--- a/tests/structs/bug613825.c-expected
+++ b/tests/structs/bug613825.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/structs/bug621176.c-expected b/tests/structs/bug621176.c-expected
index 77cae8937..4eb390933 100644
--- a/tests/structs/bug621176.c-expected
+++ b/tests/structs/bug621176.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/structs/bug622422.c-expected b/tests/structs/bug622422.c-expected
index 561b64dd1..2d3b812a8 100644
--- a/tests/structs/bug622422.c-expected
+++ b/tests/structs/bug622422.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/structs/bug623092.c-expected b/tests/structs/bug623092.c-expected
index 003620863..aeb2a517c 100644
--- a/tests/structs/bug623092.c-expected
+++ b/tests/structs/bug623092.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/structs/bug651441.c-expected b/tests/structs/bug651441.c-expected
index 05d396860..29e03c54a 100644
--- a/tests/structs/bug651441.c-expected
+++ b/tests/structs/bug651441.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/structs/bug654646.c-expected b/tests/structs/bug654646.c-expected
index ac2e178a4..423448626 100644
--- a/tests/structs/bug654646.c-expected
+++ b/tests/structs/bug654646.c-expected
@@ -5,7 +5,7 @@
#include <stdarg.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/structs/bug654753.c-expected b/tests/structs/bug654753.c-expected
index 4c60a22ac..453e30aa3 100644
--- a/tests/structs/bug654753.c-expected
+++ b/tests/structs/bug654753.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/structs/bug656693.c-expected b/tests/structs/bug656693.c-expected
index 392fe9d3b..ca9162970 100644
--- a/tests/structs/bug656693.c-expected
+++ b/tests/structs/bug656693.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/structs/bug657378.c-expected b/tests/structs/bug657378.c-expected
index 2ab07075a..44022a1dc 100644
--- a/tests/structs/bug657378.c-expected
+++ b/tests/structs/bug657378.c-expected
@@ -7,7 +7,7 @@
#include <stdarg.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/structs/bug660426.c-expected b/tests/structs/bug660426.c-expected
index 79459ede5..0cbcda581 100644
--- a/tests/structs/bug660426.c-expected
+++ b/tests/structs/bug660426.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/structs/bug661945.c-expected b/tests/structs/bug661945.c-expected
index 5d699a612..2e50063d6 100644
--- a/tests/structs/bug661945.c-expected
+++ b/tests/structs/bug661945.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/structs/bug667890.c-expected b/tests/structs/bug667890.c-expected
index 958f3df9e..38b0da0d6 100644
--- a/tests/structs/bug667890.c-expected
+++ b/tests/structs/bug667890.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/structs/bug669580.c-expected b/tests/structs/bug669580.c-expected
index 1b00223a9..2e2c42c8f 100644
--- a/tests/structs/bug669580.c-expected
+++ b/tests/structs/bug669580.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/structs/bug685177.c-expected b/tests/structs/bug685177.c-expected
index 501cf7c0a..b38ad4cc1 100644
--- a/tests/structs/bug685177.c-expected
+++ b/tests/structs/bug685177.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/structs/bug686190.c-expected b/tests/structs/bug686190.c-expected
index 67b25b0c9..baf1b507b 100644
--- a/tests/structs/bug686190.c-expected
+++ b/tests/structs/bug686190.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/structs/bug688732.c-expected b/tests/structs/bug688732.c-expected
index 74232f52e..a8b73f86c 100644
--- a/tests/structs/bug688732.c-expected
+++ b/tests/structs/bug688732.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/structs/bug690380.c-expected b/tests/structs/bug690380.c-expected
index aa4c9f7ce..710158293 100644
--- a/tests/structs/bug690380.c-expected
+++ b/tests/structs/bug690380.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/structs/bug694140.c-expected b/tests/structs/bug694140.c-expected
index e00332124..dffdff7bb 100644
--- a/tests/structs/bug694140.c-expected
+++ b/tests/structs/bug694140.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/structs/bug749952.c-expected b/tests/structs/bug749952.c-expected
index b10c074e0..711472792 100644
--- a/tests/structs/bug749952.c-expected
+++ b/tests/structs/bug749952.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/structs/bug775761.c-expected b/tests/structs/bug775761.c-expected
index 811f86265..cb33ecfbd 100644
--- a/tests/structs/bug775761.c-expected
+++ b/tests/structs/bug775761.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/structs/bug777194-2.c-expected b/tests/structs/bug777194-2.c-expected
index 101c5d55a..cfde6f98d 100644
--- a/tests/structs/bug777194-2.c-expected
+++ b/tests/structs/bug777194-2.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/structs/bug777194.c-expected b/tests/structs/bug777194.c-expected
index 055c37c70..3c21a51f7 100644
--- a/tests/structs/bug777194.c-expected
+++ b/tests/structs/bug777194.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/structs/cast-struct-boxed.c-expected b/tests/structs/cast-struct-boxed.c-expected
index 23472fd1a..1487bbdc7 100644
--- a/tests/structs/cast-struct-boxed.c-expected
+++ b/tests/structs/cast-struct-boxed.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/structs/constructor-params-array.c-expected b/tests/structs/constructor-params-array.c-expected
index d60648f81..828f801a9 100644
--- a/tests/structs/constructor-params-array.c-expected
+++ b/tests/structs/constructor-params-array.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/structs/constructor-variadic.c-expected b/tests/structs/constructor-variadic.c-expected
index 696f35bba..c3d374094 100644
--- a/tests/structs/constructor-variadic.c-expected
+++ b/tests/structs/constructor-variadic.c-expected
@@ -8,7 +8,7 @@
#include <stdarg.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/structs/default-gtype.c-expected b/tests/structs/default-gtype.c-expected
index 93efcd45a..837ef217d 100644
--- a/tests/structs/default-gtype.c-expected
+++ b/tests/structs/default-gtype.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/structs/gtype-base-struct.c-expected b/tests/structs/gtype-base-struct.c-expected
index e5966d7ed..5d9b4caac 100644
--- a/tests/structs/gtype-base-struct.c-expected
+++ b/tests/structs/gtype-base-struct.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/structs/gvalue-implicit-comparison.c-expected b/tests/structs/gvalue-implicit-comparison.c-expected
index 21d2e91bb..5bb2f0924 100644
--- a/tests/structs/gvalue-implicit-comparison.c-expected
+++ b/tests/structs/gvalue-implicit-comparison.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/structs/gvalue.c-expected b/tests/structs/gvalue.c-expected
index 695fcc180..6bfd30a59 100644
--- a/tests/structs/gvalue.c-expected
+++ b/tests/structs/gvalue.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/structs/properties.c-expected b/tests/structs/properties.c-expected
index 16cc2b654..145df40bb 100644
--- a/tests/structs/properties.c-expected
+++ b/tests/structs/properties.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/structs/simple-type-constructor.c-expected b/tests/structs/simple-type-constructor.c-expected
index 00a17265c..edd80b152 100644
--- a/tests/structs/simple-type-constructor.c-expected
+++ b/tests/structs/simple-type-constructor.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/structs/struct-base-types.c-expected b/tests/structs/struct-base-types.c-expected
index 7bbaaf579..85bff2787 100644
--- a/tests/structs/struct-base-types.c-expected
+++ b/tests/structs/struct-base-types.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/structs/struct-boxed-cast.c-expected b/tests/structs/struct-boxed-cast.c-expected
index 6b351221a..c94693100 100644
--- a/tests/structs/struct-boxed-cast.c-expected
+++ b/tests/structs/struct-boxed-cast.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/structs/struct-initializer-list-in-array.c-expected b/tests/structs/struct-initializer-list-in-array.c-expected
index 5158e3d76..814ac42fe 100644
--- a/tests/structs/struct-initializer-list-in-array.c-expected
+++ b/tests/structs/struct-initializer-list-in-array.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/structs/struct-initializer-list-nested.c-expected b/tests/structs/struct-initializer-list-nested.c-expected
index 274d1ec6c..026dcd0b5 100644
--- a/tests/structs/struct-initializer-list-nested.c-expected
+++ b/tests/structs/struct-initializer-list-nested.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/structs/struct-no-gtype.c-expected b/tests/structs/struct-no-gtype.c-expected
index b12fb74fc..269e78bbd 100644
--- a/tests/structs/struct-no-gtype.c-expected
+++ b/tests/structs/struct-no-gtype.c-expected
@@ -5,7 +5,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/structs/struct-static-field-initializer.c-expected b/tests/structs/struct-static-field-initializer.c-expected
index 6c6c16470..3e5fb096f 100644
--- a/tests/structs/struct-static-field-initializer.c-expected
+++ b/tests/structs/struct-static-field-initializer.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/structs/struct_only.c-expected b/tests/structs/struct_only.c-expected
index fe1b35e0b..33c1ffa6c 100644
--- a/tests/structs/struct_only.c-expected
+++ b/tests/structs/struct_only.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/structs/structs.c-expected b/tests/structs/structs.c-expected
index 4fba50587..8175ad78f 100644
--- a/tests/structs/structs.c-expected
+++ b/tests/structs/structs.c-expected
@@ -7,7 +7,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/threads/threadpool.c-expected b/tests/threads/threadpool.c-expected
index 0ff74363f..615c349f5 100644
--- a/tests/threads/threadpool.c-expected
+++ b/tests/threads/threadpool.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