mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix windows linking of i18npool

Browse Source 
Change-Id: I9e66d0528a8b095897e27216352979c4bcfb4eae
This commit is contained in:
Fridrich Štrba
2012-11-07 00:22:05 +01:00
parent 4c1c61ce57
commit aacefd4711
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
i18npool/Library_i18nisolang1.mk
View File

@@ -61,6 +61,11 @@ ifeq ($(ENABLE_LIBLANGTAG),YES)
$(eval $(call gb_Library_add_defs,i18nisolang1,-DENABLE_LIBLANGTAG)) $(eval $(call gb_Library_add_defs,i18nisolang1,-DENABLE_LIBLANGTAG))
$(eval $(call gb_Library_use_external,i18nisolang1,liblangtag)) $(eval $(call gb_Library_use_external,i18nisolang1,liblangtag))
$(eval $(call gb_Library_use_external,i18nisolang1,libxml2)) $(eval $(call gb_Library_use_external,i18nisolang1,libxml2))
$(eval $(call gb_Library_use_system_win32_libs,i18nisolang1,\
$(if $(filter $(COM),MSC), \
kernel32 \
) \
))
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

6
liblangtag/liblangtag-0.4.0-windows.patch
View File

@@ -120,7 +120,7 @@
+{ +{
+ lt_return_val_if_fail (v != NULL, 0); + lt_return_val_if_fail (v != NULL, 0);
+ +
+ return (int)InterlockedAdd((LONG*)v, 0); + return (int)InterlockedExchangeAdd((LONG*)v, 0);
+} +}
+ +
+LT_INLINE_FUNC int +LT_INLINE_FUNC int
@@ -128,7 +128,7 @@
+{ +{
+ lt_return_val_if_fail (v != NULL, 0); + lt_return_val_if_fail (v != NULL, 0);
+ +
+ return (int)InterlockedAdd((LONG*)v, 1); + return (int)InterlockedExchangeAdd((LONG*)v, 1) + 1;
+} +}
+ +
+lt_bool_t +lt_bool_t
@@ -136,7 +136,7 @@
+{ +{
+ lt_return_val_if_fail (v != NULL, FALSE); + lt_return_val_if_fail (v != NULL, FALSE);
+ +
+ return 1 == InterlockedAdd((LONG*)v, -1); + return 1 == InterlockedExchangeAdd((LONG*)v, -1) - 1;
+} +}
+ +
+ +