aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-18 22:22:10 +0000
committermarha <marha@users.sourceforge.net>2011-01-18 22:22:10 +0000
commite13493f3d4e467363e681ac2a216fec58b9f8770 (patch)
tree2361bb3e579ee7c6b40cdb27aa7155669537970b
parenta65902f52cde115ec5b42827ad6773b38c1e64e3 (diff)
downloadvcxsrv-e13493f3d4e467363e681ac2a216fec58b9f8770.tar.gz
vcxsrv-e13493f3d4e467363e681ac2a216fec58b9f8770.tar.bz2
vcxsrv-e13493f3d4e467363e681ac2a216fec58b9f8770.zip
dllmain should not be included in static lib
-rw-r--r--libXt/src/Vendor.c4
-rw-r--r--libXt/src/makefile1
2 files changed, 2 insertions, 3 deletions
diff --git a/libXt/src/Vendor.c b/libXt/src/Vendor.c
index 2d3090189..94ca36e41 100644
--- a/libXt/src/Vendor.c
+++ b/libXt/src/Vendor.c
@@ -67,7 +67,7 @@ SOFTWARE.
*
***************************************************************************/
-#if defined(__UNIXOS2__) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(__UNIXOS2__) || defined(__CYGWIN__) || defined(__MINGW32__) && !defined(_MSC_VER)
/* to fix the EditRes problem because of wrong linker semantics */
extern WidgetClass vendorShellWidgetClass;
@@ -153,7 +153,7 @@ externaldef(vendorshellclassrec) VendorShellClassRec vendorShellClassRec = {
}
};
-#if !defined(AIXSHLIB) || !defined(SHAREDCODE)
+#if (!defined(AIXSHLIB) || !defined(SHAREDCODE)) && !defined(_MSC_VER)
externaldef(vendorshellwidgetclass) WidgetClass vendorShellWidgetClass =
(WidgetClass) (&vendorShellClassRec);
#endif
diff --git a/libXt/src/makefile b/libXt/src/makefile
index 76441250c..a129f418b 100644
--- a/libXt/src/makefile
+++ b/libXt/src/makefile
@@ -58,7 +58,6 @@ CSRCS = \
VarGet.c \
Varargs.c \
Vendor.c \
- sharedlib.c \
StringDefs.c
BUILT_SOURCE = StringDefs.c