This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/509-remove-deprecated-version
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to
refs/heads/feature/509-remove-deprecated-version by this push:
new 65e032cb #509 Add version and version_range type header
65e032cb is described below
commit 65e032cbd3ff7ff988f1a4c691dcc7297693039e
Author: Pepijn Noltes <[email protected]>
AuthorDate: Thu Feb 8 19:37:13 2024 +0100
#509 Add version and version_range type header
---
libs/utils/include/celix_version.h | 3 +-
libs/utils/include/celix_version_range.h | 18 +++++-------
libs/utils/include/celix_version_range_type.h | 42 +++++++++++++++++++++++++++
libs/utils/include/celix_version_type.h | 41 ++++++++++++++++++++++++++
4 files changed, 92 insertions(+), 12 deletions(-)
diff --git a/libs/utils/include/celix_version.h
b/libs/utils/include/celix_version.h
index 34e67c25..e711baaf 100644
--- a/libs/utils/include/celix_version.h
+++ b/libs/utils/include/celix_version.h
@@ -21,8 +21,9 @@
#define CELIX_CELIX_VERSION_H
#include <stdbool.h>
-#include <stdlib.h>
+#include <stddef.h>
+#include "celix_version_type.h"
#include "celix_cleanup.h"
#include "celix_utils_export.h"
diff --git a/libs/utils/include/celix_version_range.h
b/libs/utils/include/celix_version_range.h
index 977dc71c..cddfbc78 100644
--- a/libs/utils/include/celix_version_range.h
+++ b/libs/utils/include/celix_version_range.h
@@ -18,25 +18,21 @@
*/
-#ifndef CELIX_VERSION_RANGE_H_
-#define CELIX_VERSION_RANGE_H_
+#ifndef CELIX_VERSION_RANGE_H
+#define CELIX_VERSION_RANGE_H
#include <stdbool.h>
-#include "celix_cleanup.h"
-#include "celix_errno.h"
-#include "celix_version.h"
+#include "celix_version_range_type.h"
+#include "celix_version_type.h"
#include "celix_utils_export.h"
+#include "celix_errno.h"
+#include "celix_cleanup.h"
#ifdef __cplusplus
extern "C" {
#endif
-/**
- * Type definition for the celix_version_range_t abstract data type.
- */
-typedef struct celix_version_range celix_version_range_t;
-
/**
* Creates a new <code>celix_version_range_t*</code>.
*
@@ -146,4 +142,4 @@ CELIX_UTILS_EXPORT bool
celix_versionRange_createLDAPFilterInPlace(const celix_v
}
#endif
-#endif /* CELIX_VERSION_RANGE_H_ */
+#endif /* CELIX_VERSION_RANGE_H */
diff --git a/libs/utils/include/celix_version_range_type.h
b/libs/utils/include/celix_version_range_type.h
new file mode 100644
index 00000000..a2dd7ec2
--- /dev/null
+++ b/libs/utils/include/celix_version_range_type.h
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+#ifndef CELIX_VERSION_RANGE_TYPE_H
+#define CELIX_VERSION_RANGE_TYPE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @file celix_version_range_type.h
+ * @brief Header file for celix_version_range_t opaque type. Can be used for
forward declaration.
+ */
+
+/**
+ * Type definition for the celix_version_range_t abstract data type.
+ */
+typedef struct celix_version_range celix_version_range_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CELIX_VERSION_RANGE_TYPE_H */
diff --git a/libs/utils/include/celix_version_type.h
b/libs/utils/include/celix_version_type.h
new file mode 100644
index 00000000..dff2151b
--- /dev/null
+++ b/libs/utils/include/celix_version_type.h
@@ -0,0 +1,41 @@
+/**
+ *Licensed to the Apache Software Foundation (ASF) under one
+ *or more contributor license agreements. See the NOTICE file
+ *distributed with this work for additional information
+ *regarding copyright ownership. The ASF licenses this file
+ *to you under the Apache License, Version 2.0 (the
+ *"License"); you may not use this file except in compliance
+ *with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *Unless required by applicable law or agreed to in writing,
+ *software distributed under the License is distributed on an
+ *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ *specific language governing permissions and limitations
+ *under the License.
+ */
+
+#ifndef CELIX_CELIX_VERSION_TYPE_H
+#define CELIX_CELIX_VERSION_TYPE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @file celix_version_type.h
+ * @brief Header file for celix_version_t opaque type. Can be used for forward
declaration.
+ */
+
+/**
+ * @brief The definition of the celix_version_t* abstract data type.
+ */
+typedef struct celix_version celix_version_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //CELIX_CELIX_VERSION_TYPE_H
