celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-309: Removed ffi dependency from dfi headers
Date Wed, 02 Dec 2015 22:09:16 GMT
Repository: celix
Updated Branches:
  refs/heads/develop d1f05cebf -> 8f379dfe2


CELIX-309: Removed ffi dependency from dfi headers


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/8f379dfe
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/8f379dfe
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/8f379dfe

Branch: refs/heads/develop
Commit: 8f379dfe2859f82e85198ae239328a5550407878
Parents: d1f05ce
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Wed Dec 2 23:09:46 2015 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Wed Dec 2 23:09:46 2015 +0100

----------------------------------------------------------------------
 dfi/private/src/dyn_function.c    | 3 +++
 dfi/private/src/dyn_type.c        | 2 ++
 dfi/private/src/json_rpc.c        | 1 +
 dfi/public/include/dyn_function.h | 1 -
 dfi/public/include/dyn_type.h     | 2 --
 5 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/8f379dfe/dfi/private/src/dyn_function.c
----------------------------------------------------------------------
diff --git a/dfi/private/src/dyn_function.c b/dfi/private/src/dyn_function.c
index 9ef7aa0..3727f8a 100644
--- a/dfi/private/src/dyn_function.c
+++ b/dfi/private/src/dyn_function.c
@@ -20,6 +20,7 @@
 
 #include <strings.h>
 #include <stdlib.h>
+#include <ffi.h>
 
 #include "dyn_common.h"
 
@@ -58,6 +59,8 @@ static int dynFunction_initCif(dyn_function_type *dynFunc);
 static int dynFunction_parseDescriptor(dyn_function_type *dynFunc, FILE *descriptor);
 static void dynFunction_ffiBind(ffi_cif *cif, void *ret, void *args[], void *userData);
 
+extern ffi_type * dynType_ffiType(dyn_type *type);
+
 int dynFunction_parse(FILE *descriptor, struct types_head *refTypes, dyn_function_type **out)
{
     int status = OK;
     dyn_function_type *dynFunc = NULL;

http://git-wip-us.apache.org/repos/asf/celix/blob/8f379dfe/dfi/private/src/dyn_type.c
----------------------------------------------------------------------
diff --git a/dfi/private/src/dyn_type.c b/dfi/private/src/dyn_type.c
index c47c8c6..9b98a43 100644
--- a/dfi/private/src/dyn_type.c
+++ b/dfi/private/src/dyn_type.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
+#include <ffi.h>
 
 #include "dyn_common.h"
 
@@ -32,6 +33,7 @@ static void dynType_clear(dyn_type *type);
 static void dynType_clearComplex(dyn_type *type);
 static void dynType_clearSequence(dyn_type *type);
 static void dynType_clearTypedPointer(dyn_type *type);
+ffi_type * dynType_ffiType(dyn_type *type);
 
 static struct type_entry *dynType_allocTypeEntry(void);
 

http://git-wip-us.apache.org/repos/asf/celix/blob/8f379dfe/dfi/private/src/json_rpc.c
----------------------------------------------------------------------
diff --git a/dfi/private/src/json_rpc.c b/dfi/private/src/json_rpc.c
index e13c8ef..20d453d 100644
--- a/dfi/private/src/json_rpc.c
+++ b/dfi/private/src/json_rpc.c
@@ -24,6 +24,7 @@
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
+#include <ffi.h>
 
 
 static int OK = 0;

http://git-wip-us.apache.org/repos/asf/celix/blob/8f379dfe/dfi/public/include/dyn_function.h
----------------------------------------------------------------------
diff --git a/dfi/public/include/dyn_function.h b/dfi/public/include/dyn_function.h
index 792691e..7f5cd57 100644
--- a/dfi/public/include/dyn_function.h
+++ b/dfi/public/include/dyn_function.h
@@ -19,7 +19,6 @@
 #ifndef __DYN_FUNCTION_H_
 #define __DYN_FUNCTION_H_
 
-#include <ffi.h>
 #include "dyn_type.h"
 #include "dfi_log_util.h"
 

http://git-wip-us.apache.org/repos/asf/celix/blob/8f379dfe/dfi/public/include/dyn_type.h
----------------------------------------------------------------------
diff --git a/dfi/public/include/dyn_type.h b/dfi/public/include/dyn_type.h
index b2b84ef..f80175f 100644
--- a/dfi/public/include/dyn_type.h
+++ b/dfi/public/include/dyn_type.h
@@ -24,7 +24,6 @@
 #include <sys/queue.h>
 #include <stdbool.h>
 
-#include <ffi.h>
 #include <stdint.h>
 
 #include "dfi_log_util.h"
@@ -128,7 +127,6 @@ void dynType_print(dyn_type *type, FILE *stream);
 size_t dynType_size(dyn_type *type);
 int dynType_type(dyn_type *type);
 int dynType_descriptorType(dyn_type *type);
-ffi_type * dynType_ffiType(dyn_type *type);
 const char * dynType_getMetaInfo(dyn_type *type, const char *name);
 
 //complexType


Mime
View raw message