summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2011-12-15 14:32:40 +0100
committerMichael Stahl <mstahl@redhat.com>2011-12-15 17:24:38 +0100
commit7eaf07eea371fadbc48c4d59c8b49bf8daf2eb6a (patch)
tree96cc78d7d2fe57ccdb96f7d8b06590f3d84b996a /connectivity
parent4362f16588dd5937dedd4922af1714aa949ecdba (diff)
fdo#43707: tweak workarounds for fdo#42865:
Apparently on Windows the SAL_DLLPUBLIC_EXPORT does not work for unknown reasons, so use the old mapfiles on that platform. Should fix regressions from 1fb5eb21, 48dbaa51, a9da5a0b. (cherry picked from commit 5bb7eea39420c79ee72b7559f4e3d90d1abb4994)
Diffstat (limited to 'connectivity')
-rwxr-xr-xconnectivity/source/drivers/mozab/makefile.mk8
-rw-r--r--connectivity/source/drivers/mozab/mozabdrv.map8
2 files changed, 16 insertions, 0 deletions
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 07e6dcce0b4a..d1d487344941 100755
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -85,7 +85,11 @@ SLOFILES=\
# --- MOZAB BASE Library -----------------------------------
+.IF "$(GUI)"=="WNT"
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
+.ELSE # just a quick hack for GCC fdo#42865
SHL1USE_EXPORTS = name
+.ENDIF
SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -145,7 +149,11 @@ DEPOBJFILES=$(SLO2FILES)
# --- MOZAB BASE Library -----------------------------------
+.IF "$(GUI)"=="WNT"
+SHL2VERSIONMAP=$(TARGET2).map
+.ELSE # just a quick hack for GCC fdo#42865
SHL2USE_EXPORTS = name
+.ENDIF
SHL2NOCHECK=TRUE
SHL2TARGET= $(TARGET2)$(DLLPOSTFIX)
SHL2OBJS=$(SLO2FILES)
diff --git a/connectivity/source/drivers/mozab/mozabdrv.map b/connectivity/source/drivers/mozab/mozabdrv.map
new file mode 100644
index 000000000000..a431a0737754
--- /dev/null
+++ b/connectivity/source/drivers/mozab/mozabdrv.map
@@ -0,0 +1,8 @@
+UDK_3_0_0 {
+ global:
+ OMozabConnection_CreateInstance;
+ OMozillaBootstrap_CreateInstance;
+ setMozabServiceFactory;
+ local:
+ *;
+};