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-452: Moves the typedef of service_reference to celix_types.h
Date Tue, 10 Jul 2018 15:59:08 GMT
Repository: celix
Updated Branches:
  refs/heads/develop ab3696971 -> 3415b8f3e


CELIX-452: Moves the typedef of service_reference to celix_types.h


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

Branch: refs/heads/develop
Commit: 3415b8f3ee0bddab0b442392033338494f9f04a6
Parents: ab36969
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Tue Jul 10 17:58:30 2018 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Tue Jul 10 17:58:30 2018 +0200

----------------------------------------------------------------------
 libs/framework/include/celix_service_event.h | 5 ++---
 libs/framework/include/celix_types.h         | 1 +
 libs/framework/include/service_reference.h   | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/3415b8f3/libs/framework/include/celix_service_event.h
----------------------------------------------------------------------
diff --git a/libs/framework/include/celix_service_event.h b/libs/framework/include/celix_service_event.h
index bc6431d..9bf36d2 100644
--- a/libs/framework/include/celix_service_event.h
+++ b/libs/framework/include/celix_service_event.h
@@ -17,10 +17,11 @@
  *under the License.
  */
 
+#include "celix_types.h"
+
 #ifndef CELIX_SERVICE_EVENT_H_
 #define CELIX_SERVICE_EVENT_H_
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -32,8 +33,6 @@ typedef enum celix_service_event_type {
 	OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED_ENDMATCH = 0x00000008,
 } celix_service_event_type_t;
 
-typedef struct serviceReference * service_reference_pt; //forward declaration
-
 typedef struct celix_service_event {
 	service_reference_pt reference;
 	celix_service_event_type_t type;

http://git-wip-us.apache.org/repos/asf/celix/blob/3415b8f3/libs/framework/include/celix_types.h
----------------------------------------------------------------------
diff --git a/libs/framework/include/celix_types.h b/libs/framework/include/celix_types.h
index 6e02c63..9f73a42 100644
--- a/libs/framework/include/celix_types.h
+++ b/libs/framework/include/celix_types.h
@@ -49,5 +49,6 @@ typedef struct dm_service_dependency *dm_service_dependency_pt;
 typedef struct dm_service_dependency dm_service_dependency_t;
 
 typedef struct service_factory *service_factory_pt; //deprecated
+typedef struct serviceReference * service_reference_pt;
 
 #endif //CELIX_CELIX_TYPES_H

http://git-wip-us.apache.org/repos/asf/celix/blob/3415b8f3/libs/framework/include/service_reference.h
----------------------------------------------------------------------
diff --git a/libs/framework/include/service_reference.h b/libs/framework/include/service_reference.h
index aff427a..e094b4c 100644
--- a/libs/framework/include/service_reference.h
+++ b/libs/framework/include/service_reference.h
@@ -20,8 +20,7 @@
 #ifndef SERVICE_REFERENCE_H_
 #define SERVICE_REFERENCE_H_
 
-typedef struct serviceReference * service_reference_pt;
-
+#include "celix_types.h"
 #include "celixbool.h"
 #include "array_list.h"
 #include "service_registration.h"


Mime
View raw message