[Libreoffice-commits] core.git: Branch 'private/tbsdy/workben' - sal/Executable_salmain_bin.mk sal/workben

Chris Sherlock chris.sherlock79 at gmail.com
Sun Jul 23 09:41:17 UTC 2017


 sal/Executable_salmain_bin.mk |    2 +-
 sal/workben/salmain_bin.cxx   |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 485c9bbb28df4a20236136895e740adad748b3d3
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sun Jul 23 19:40:15 2017 +1000

    update salmain_bin program - .mk was wrong
    
    Change-Id: Ica82e7a7941181cfa387749a3bab33852791c630

diff --git a/sal/Executable_salmain_bin.mk b/sal/Executable_salmain_bin.mk
index 55e391c59405..95aaafd6abcb 100644
--- a/sal/Executable_salmain_bin.mk
+++ b/sal/Executable_salmain_bin.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Executable_use_libraries,salmain_bin,\
     sal \
 ))
 
-$(eval $(call gb_Executable_add_objects,salmain_bin,\
+$(eval $(call gb_Executable_add_exception_objects,salmain_bin,\
     sal/workben/salmain_bin \
 ))
 
diff --git a/sal/workben/salmain_bin.cxx b/sal/workben/salmain_bin.cxx
index 87fe94e0913e..a014db2c5820 100644
--- a/sal/workben/salmain_bin.cxx
+++ b/sal/workben/salmain_bin.cxx
@@ -19,7 +19,11 @@
 
 #include <sal/main.h>
 
-SAL_IMPLEMENT_MAIN() {
+#include <cstdio>
+
+SAL_IMPLEMENT_MAIN()
+{
+    fprintf(stdout, "Hello world\n");
     return 0;
 }
 


More information about the Libreoffice-commits mailing list