include/onlineupdate/mozilla/Attributes.h | 16 ----------------
onlineupdate/Executable_mbsdiff.mk | 4 ++++
onlineupdate/Executable_update_service.mk | 8 ++++++--
onlineupdate/Executable_updater.mk | 3 +--
onlineupdate/StaticLibrary_libmar.mk | 4 ++++
onlineupdate/StaticLibrary_libmarverify.mk | 1 +
onlineupdate/StaticLibrary_updatehelper.mk | 1 +
7 files changed, 17 insertions(+), 20 deletions(-)
New commits:
commit ec46d6dc31f015298a049ff1f1d3e325e4dc7885
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Tue Dec 5 08:48:53 2023 +0000
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue Dec 5 09:54:43 2023 +0100
Fix windows build some more
Change-Id: Ib90844096565d164226c72a9dedaccf6f49a74f1
diff --git a/include/onlineupdate/mozilla/Attributes.h
b/include/onlineupdate/mozilla/Attributes.h
index 1f05ad3315b3..6b93ee1b2193 100644
--- a/include/onlineupdate/mozilla/Attributes.h
+++ b/include/onlineupdate/mozilla/Attributes.h
@@ -87,22 +87,6 @@
#endif
#endif
-/**
- * Per clang's documentation:
- *
- * If a statement is marked nomerge and contains call expressions, those call
- * expressions inside the statement will not be merged during optimization.
This
- * attribute can be used to prevent the optimizer from obscuring the source
- * location of certain calls.
- *
- * This is useful to have clearer information on assertion failures.
- */
-#if defined(__clang__) && __has_attribute(nomerge)
-#define MOZ_NOMERGE __attribute__((nomerge))
-#else
-#define MOZ_NOMERGE
-#endif
-
/*
* MOZ_NEVER_INLINE is a macro which expands to tell the compiler that the
* method decorated with it must never be inlined, even if the compiler would
diff --git a/onlineupdate/Executable_mbsdiff.mk
b/onlineupdate/Executable_mbsdiff.mk
index fded20228f10..562ad184a0ea 100644
--- a/onlineupdate/Executable_mbsdiff.mk
+++ b/onlineupdate/Executable_mbsdiff.mk
@@ -25,6 +25,10 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Executable_add_libs,mbsdiff,\
ws2_32.lib \
))
+
+$(eval $(call gb_Executable_add_defs,mbsdiff,\
+ -DXP_WIN=1 \
+))
endif
$(eval $(call gb_Executable_add_cxxobjects,mbsdiff,\
diff --git a/onlineupdate/Executable_update_service.mk
b/onlineupdate/Executable_update_service.mk
index 1ac72e854293..5ad5667732d9 100644
--- a/onlineupdate/Executable_update_service.mk
+++ b/onlineupdate/Executable_update_service.mk
@@ -48,6 +48,10 @@ $(eval $(call gb_Executable_add_ldflags,update_service,\
/ENTRY:wmainCRTStartup \
))
+$(eval $(call gb_Executable_add_defs,update_service,\
+ -DXP_WIN=1 \
+))
+
$(eval $(call gb_Executable_add_exception_objects,update_service,\
onlineupdate/source/update/common/certificatecheck \
onlineupdate/source/service/maintenanceservice \
diff --git a/onlineupdate/StaticLibrary_libmar.mk
b/onlineupdate/StaticLibrary_libmar.mk
index ab6b485e0ccb..7273ab397ec1 100644
--- a/onlineupdate/StaticLibrary_libmar.mk
+++ b/onlineupdate/StaticLibrary_libmar.mk
@@ -22,6 +22,10 @@ $(eval $(call gb_StaticLibrary_add_cobjects,libmar,\
onlineupdate/source/libmar/src/mar_read \
))
+$(eval $(call gb_StaticLibrary_add_defs,libmar,\
+ -DXP_WIN=1 \
+))
+
$(eval $(call gb_StaticLibrary_use_static_libraries,\
libmarverify \
))
diff --git a/onlineupdate/StaticLibrary_libmarverify.mk
b/onlineupdate/StaticLibrary_libmarverify.mk
index 1a9204a867c9..c4c4c8e2104e 100644
--- a/onlineupdate/StaticLibrary_libmarverify.mk
+++ b/onlineupdate/StaticLibrary_libmarverify.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_StaticLibrary_set_include,libmarverify,\
ifneq ($(OS),WNT)
$(eval $(call gb_StaticLibrary_add_defs,libmarverify,\
-DMAR_NSS \
+ -DXP_WIN=1 \
))
$(eval $(call gb_StaticLibrary_use_externals,libmarverify,\
diff --git a/onlineupdate/StaticLibrary_updatehelper.mk
b/onlineupdate/StaticLibrary_updatehelper.mk
index 96129fdba267..cbb0130759e9 100644
--- a/onlineupdate/StaticLibrary_updatehelper.mk
+++ b/onlineupdate/StaticLibrary_updatehelper.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_StaticLibrary_set_include,updatehelper,\
$(eval $(call gb_StaticLibrary_add_defs,updatehelper,\
-DNSS3 \
-DVERIFY_MAR_SIGNATURE \
+ -DXP_WIN=1 \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,updatehelper,\
commit d143109b49908db2142cdd8435b4cf3164bb510f
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Mon Dec 4 23:23:43 2023 +0000
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue Dec 5 09:54:37 2023 +0100
Fixup windows
Change-Id: Ic8426edfe6d5686791c14ddde31347f6139c7b3e
diff --git a/onlineupdate/Executable_update_service.mk
b/onlineupdate/Executable_update_service.mk
index 6ff9afd1a6a8..1ac72e854293 100644
--- a/onlineupdate/Executable_update_service.mk
+++ b/onlineupdate/Executable_update_service.mk
@@ -49,9 +49,9 @@ $(eval $(call gb_Executable_add_ldflags,update_service,\
))
$(eval $(call gb_Executable_add_exception_objects,update_service,\
- onlineupdate/source/service/certificatecheck \
+ onlineupdate/source/update/common/certificatecheck \
onlineupdate/source/service/maintenanceservice \
- onlineupdate/source/service/registrycertificates \
+ onlineupdate/source/update/common/registrycertificates \
onlineupdate/source/service/servicebase \
onlineupdate/source/service/serviceinstall \
onlineupdate/source/service/workmonitor \
diff --git a/onlineupdate/Executable_updater.mk
b/onlineupdate/Executable_updater.mk
index 57cd9efc6978..949328384401 100644
--- a/onlineupdate/Executable_updater.mk
+++ b/onlineupdate/Executable_updater.mk
@@ -86,8 +86,7 @@ $(eval $(call gb_Executable_add_exception_objects,updater,\
onlineupdate/source/update/updater/updater \
$(if $(filter WNT,$(OS)),\
onlineupdate/source/update/updater/loaddlls \
- onlineupdate/source/update/updater/progressui_win \
- onlineupdate/source/update/updater/win_dirent )\
+ onlineupdate/source/update/updater/progressui_win )\
))
# vim:set shiftwidth=4 tabstop=4 noexpandtab: */
diff --git a/onlineupdate/source/service/maintenanceservice.cpp
b/onlineupdate/source/service/maintenanceservice.cxx
similarity index 100%
rename from onlineupdate/source/service/maintenanceservice.cpp
rename to onlineupdate/source/service/maintenanceservice.cxx
diff --git a/onlineupdate/source/service/servicebase.cpp
b/onlineupdate/source/service/servicebase.cxx
similarity index 100%
rename from onlineupdate/source/service/servicebase.cpp
rename to onlineupdate/source/service/servicebase.cxx
diff --git a/onlineupdate/source/service/serviceinstall.cpp
b/onlineupdate/source/service/serviceinstall.cxx
similarity index 100%
rename from onlineupdate/source/service/serviceinstall.cpp
rename to onlineupdate/source/service/serviceinstall.cxx
diff --git a/onlineupdate/source/service/workmonitor.cpp
b/onlineupdate/source/service/workmonitor.cxx
similarity index 100%
rename from onlineupdate/source/service/workmonitor.cpp
rename to onlineupdate/source/service/workmonitor.cxx
