Merge portable proplib 0.6.3.

lib/portableproplib/prop/prop_array.h

@@ -37,7 +37,10 @@
 
 typedef struct _prop_array *prop_array_t;
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 prop_array_t	prop_array_create(void);
 prop_array_t	prop_array_create_with_capacity(unsigned int);
 
@@ -140,6 +143,8 @@ bool		prop_array_set_cstring_nocopy(prop_array_t,
 						   const char *);
 bool		prop_array_add_and_rel(prop_array_t, prop_object_t);
 
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _PROPLIB_PROP_ARRAY_H_ */

lib/portableproplib/prop/prop_bool.h

@@ -37,13 +37,19 @@
 
 typedef struct _prop_bool *prop_bool_t;
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 prop_bool_t	prop_bool_create(bool);
 prop_bool_t	prop_bool_copy(prop_bool_t);
 
 bool		prop_bool_true(prop_bool_t);
 
 bool		prop_bool_equals(prop_bool_t, prop_bool_t);
-__END_DECLS
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _PROPLIB_PROP_BOOL_H_ */

lib/portableproplib/prop/prop_data.h

@@ -38,7 +38,10 @@
 
 typedef struct _prop_data *prop_data_t;
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 prop_data_t	prop_data_create_data(const void *, size_t);
 prop_data_t	prop_data_create_data_nocopy(const void *, size_t);
 
@@ -51,6 +54,9 @@ const void *	prop_data_data_nocopy(prop_data_t);
 
 bool		prop_data_equals(prop_data_t, prop_data_t);
 bool		prop_data_equals_data(prop_data_t, const void *, size_t);
-__END_DECLS
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _PROPLIB_PROP_DATA_H_ */

lib/portableproplib/prop/prop_dictionary.h

@@ -39,7 +39,10 @@
 typedef struct _prop_dictionary *prop_dictionary_t;
 typedef struct _prop_dictionary_keysym *prop_dictionary_keysym_t;
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 prop_dictionary_t prop_dictionary_create(void);
 prop_dictionary_t prop_dictionary_create_with_capacity(unsigned int);
 
@@ -148,6 +151,8 @@ bool		prop_dictionary_set_and_rel(prop_dictionary_t,
 					    const char *,
 					    prop_object_t);
 
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _PROPLIB_PROP_DICTIONARY_H_ */

lib/portableproplib/prop/prop_ingest.h

@@ -72,7 +72,10 @@ typedef struct {
 #define	PROP_INGEST_END							\
 	{ .pite_key = NULL }
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 prop_ingest_context_t
 		prop_ingest_context_alloc(void *);
 void		prop_ingest_context_free(prop_ingest_context_t);
@@ -86,6 +89,8 @@ void *		prop_ingest_context_private(prop_ingest_context_t);
 bool		prop_dictionary_ingest(prop_dictionary_t,
 				       const prop_ingest_table_entry[],
 				       prop_ingest_context_t);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _PROPLIB_PROP_INGEST_H_ */

lib/portableproplib/prop/prop_number.h

@@ -37,7 +37,10 @@
 
 typedef struct _prop_number *prop_number_t;
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 prop_number_t	prop_number_create_integer(int64_t);
 prop_number_t	prop_number_create_unsigned_integer(uint64_t);
 
@@ -52,6 +55,9 @@ uint64_t	prop_number_unsigned_integer_value(prop_number_t);
 bool		prop_number_equals(prop_number_t, prop_number_t);
 bool		prop_number_equals_integer(prop_number_t, int64_t);
 bool		prop_number_equals_unsigned_integer(prop_number_t, uint64_t);
-__END_DECLS
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _PROPLIB_PROP_NUMBER_H_ */

lib/portableproplib/prop/prop_object.h

@@ -48,7 +48,10 @@ typedef enum {
 	PROP_TYPE_DICT_KEYSYM	=	0x646b6579	/* 'dkey' */
 } prop_type_t;
 
-__BEGIN_DECLS
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 void		prop_object_retain(prop_object_t);
 void		prop_object_release(prop_object_t);
 
@@ -62,6 +65,9 @@ typedef struct _prop_object_iterator *prop_object_iterator_t;
 prop_object_t	prop_object_iterator_next(prop_object_iterator_t);
 void		prop_object_iterator_reset(prop_object_iterator_t);
 void		prop_object_iterator_release(prop_object_iterator_t);
-__END_DECLS
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _PROPLIB_PROP_OBJECT_H_ */

lib/portableproplib/prop/prop_string.h

@@ -38,7 +38,10 @@
 
 typedef struct _prop_string *prop_string_t;
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 prop_string_t	prop_string_create(void);
 prop_string_t	prop_string_create_cstring(const char *);
 prop_string_t	prop_string_create_cstring_nocopy(const char *);
@@ -57,6 +60,9 @@ bool		prop_string_append_cstring(prop_string_t, const char *);
 
 bool		prop_string_equals(prop_string_t, prop_string_t);
 bool		prop_string_equals_cstring(prop_string_t, const char *);
-__END_DECLS
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _PROPLIB_PROP_STRING_H_ */

lib/portableproplib/prop/rbtree.h

@@ -39,10 +39,16 @@
 #include <stdbool.h>
 #include <inttypes.h>
 #endif
-#include <sys/types.h>
-#include <sys/cdefs.h>
 #include <queue.h>
 
+/* GCC version checking borrowed from glibc. */
+#if defined(__GNUC__) && defined(__GNUC_MINOR__)
+#  define __GNUC_PREREQ(maj,min) \
+	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#else
+#  define __GNUC_PREREQ(maj,min) 0
+#endif
+
 #if __GNUC_PREREQ(2, 96)
 # ifndef __predict_true
 #  define __predict_true(exp)     __builtin_expect((exp), 1)
@@ -59,7 +65,9 @@
 # endif
 #endif
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef struct rb_node {
 	struct rb_node *rb_nodes[2];
@@ -207,6 +215,8 @@ void	rb_tree_check(const rb_tree_t *, bool);
 void	rb_tree_depths(const rb_tree_t *, size_t *);
 #endif
 
-__END_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #endif	/* _SYS_RBTREE_H_*/