[celix] branch master updated: Correct build errors on OSX, issue #567

[pengzheng]

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

pengzheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/master by this push:
     new 12a8f42b Correct build errors on OSX, issue #567
     new 2efed0a8 Merge pull request #568 from schorg/master
12a8f42b is described below

commit 12a8f42b819ca3a8c346cfb46df9d415e7b79ddb
Author: Franz-Josef Grosch <sch...@gmail.com>
AuthorDate: Thu Jun 1 17:36:56 2023 +0200

    Correct build errors on OSX, issue #567
---
 bundles/deployment_admin/src/ioapi.c   |  3 +--
 bundles/deployment_admin/src/miniunz.c | 15 +++++++--------
 documents/building/README.md           |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/bundles/deployment_admin/src/ioapi.c 
b/bundles/deployment_admin/src/ioapi.c
index 49958f61..df10bfee 100644
--- a/bundles/deployment_admin/src/ioapi.c
+++ b/bundles/deployment_admin/src/ioapi.c
@@ -209,8 +209,7 @@ static int ZCALLBACK ferror_file_func (voidpf opaque, 
voidpf stream)
     return ret;
 }
 
-void fill_fopen_filefunc (pzlib_filefunc_def)
-  zlib_filefunc_def* pzlib_filefunc_def;
+void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
 {
     pzlib_filefunc_def->zopen_file = fopen_file_func;
     pzlib_filefunc_def->zread_file = fread_file_func;
diff --git a/bundles/deployment_admin/src/miniunz.c 
b/bundles/deployment_admin/src/miniunz.c
index e543c3b3..1091b0d3 100644
--- a/bundles/deployment_admin/src/miniunz.c
+++ b/bundles/deployment_admin/src/miniunz.c
@@ -91,10 +91,11 @@
     filename : the filename of the file where date/time must be modified
     dosdate : the new date at the MSDos format (4 bytes)
     tmu_date : the SAME new date at the tm_unz format */
-void change_file_date(filename,dosdate,tmu_date)
-    const char *filename;
-    uLong dosdate;
-    tm_unz tmu_date;
+void change_file_date(
+    const char *filename,
+    uLong dosdate,
+    tm_unz tmu_date
+)
 {
 #ifdef _WIN32
   HANDLE hFile;
@@ -132,8 +133,7 @@ void change_file_date(filename,dosdate,tmu_date)
 /* mymkdir and change_file_date are not 100 % portable
    As I don't know well Unix, I wait feedback for the unix portion */
 
-int mymkdir(dirname)
-    const char* dirname;
+int mymkdir(const char* dirname)
 {
     int ret=0;
 #ifdef _WIN32
@@ -146,8 +146,7 @@ int mymkdir(dirname)
     return ret;
 }
 
-int makedir (newdir)
-    char *newdir;
+int makedir (char *newdir)
 {
   char *buffer ;
   char *p;
diff --git a/documents/building/README.md b/documents/building/README.md
index eacaf555..5a9aa530 100644
--- a/documents/building/README.md
+++ b/documents/building/README.md
@@ -88,7 +88,7 @@ snap install cmake
 For OSX systems with brew installed, use the following commands:
 ```bash
     brew update && \
-    brew install lcov libffi libzip czmq rapidjson libxml2 cmake && \
+    brew install lcov libffi libzip czmq rapidjson libxml2 cmake jansson && \
     brew link --force libffi
 ```