This is an automated email from the ASF dual-hosted git repository.

truckman pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 0897ef4cee Fix c99 errors
0897ef4cee is described below

commit 0897ef4cee1ef03c6dd4a2b64f2839ade1353eb8
Author: Don Lewis <truck...@apache.org>
AuthorDate: Sat Nov 16 20:37:53 2024 -0800

    Fix c99 errors
    
    Add missing declarations to make the code compliant with c99.
---
 main/libxmlsec/xmlsec1-nssmangleciphers.patch | 3 ++-
 main/sal/osl/unx/signal.c                     | 7 +++++++
 main/sal/osl/unx/system.c                     | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/main/libxmlsec/xmlsec1-nssmangleciphers.patch 
b/main/libxmlsec/xmlsec1-nssmangleciphers.patch
index 96f5049f68..bcb703d4b9 100644
--- a/main/libxmlsec/xmlsec1-nssmangleciphers.patch
+++ b/main/libxmlsec/xmlsec1-nssmangleciphers.patch
@@ -736,7 +736,7 @@
        xmlSecError(XMLSEC_ERRORS_HERE, 
                    xmlSecErrorsSafeString(cipherName),
                    "PK11_CipherOp",
-@@ -363,300 +595,169 @@
+@@ -363,300 +595,170 @@
                    XMLSEC_ERRORS_NO_MESSAGE);
        return(-1);
      }
@@ -971,6 +971,7 @@
 + *
 + * Returns 0 on success or a negative value otherwise.
 + */
++static int
 +xmlSecNssBlockCipherExecute(
 +    xmlSecTransformPtr transform ,
 +    int last ,
diff --git a/main/sal/osl/unx/signal.c b/main/sal/osl/unx/signal.c
index c592124727..e51b2cc478 100644
--- a/main/sal/osl/unx/signal.c
+++ b/main/sal/osl/unx/signal.c
@@ -44,6 +44,13 @@
 #define STACKTYPE "Linux"
 #endif
 
+#ifdef FREEBSD
+#include <execinfo.h>
+#include <link.h>
+#define INCLUDE_BACKTRACE
+#define STACKTYPE "FreeBSD"
+#endif
+
 #ifdef SOLARIS
 
 #include "backtrace.h"
diff --git a/main/sal/osl/unx/system.c b/main/sal/osl/unx/system.c
index eee84c85d9..c101d0f4b4 100644
--- a/main/sal/osl/unx/system.c
+++ b/main/sal/osl/unx/system.c
@@ -21,6 +21,7 @@
 
 
 
+#include <math.h>
 #include "system.h"
 
 #ifdef NO_PTHREAD_RTL

Reply via email to