[libreoffice/f16] don't have SAL_WARN on older version

Caolán McNamara caolanm at fedoraproject.org
Thu Dec 15 16:43:18 UTC 2011


commit 5e0b3df3900f460d9fd3fc0e1fcb1d2936d649d1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 15 16:43:16 2011 +0000

    don't have SAL_WARN on older version

 ...bz-767708-avoid-SIGBUS-writing-to-overcom.patch |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch b/0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
index 1b611e6..f1b846e 100644
--- a/0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
+++ b/0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
@@ -12,14 +12,6 @@ diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cp
 index 2703ac0..b049c7f 100644
 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
 +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
-@@ -40,6 +40,7 @@
- #include "osl/mutex.hxx"
- #include "rtl/alloc.h"
- #include "rtl/ustring.hxx"
-+#include "sal/log.hxx"
- #include "sal/types.h"
- #include "typelib/typedescription.hxx"
- 
 @@ -65,6 +66,10 @@
  #error Unsupported platform
  #endif
@@ -40,7 +32,7 @@ index 2703ac0..b049c7f 100644
 +        if (err != 0)
          {
 -            perror("truncation of executable memory area failed");
-+            SAL_WARN("bridges", "posix_fallocate failed with code " << err);
++            fprintf(stderr, "posix_fallocate failed with code %d\n", err);
              close(block.fd);
              block.fd = -1;
              break;


More information about the scm-commits mailing list