projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'github/pr/1952'
[collectd.git]
/
src
/
utils_format_json_test.c
diff --git
a/src/utils_format_json_test.c
b/src/utils_format_json_test.c
index
353ef01
..
d13c932
100644
(file)
--- a/
src/utils_format_json_test.c
+++ b/
src/utils_format_json_test.c
@@
-24,8
+24,21
@@
* Florian octo Forster <octo at collectd.org>
*/
* Florian octo Forster <octo at collectd.org>
*/
-#include "testing.h"
+/* Workaround for Solaris 10 defining label_t
+ * Issue #1301
+ */
+
+#include "config.h"
+#if KERNEL_SOLARIS
+# ifndef _POSIX_C_SOURCE
+# define _POSIX_C_SOURCE 200112L
+# endif
+# undef __EXTENSIONS__
+#endif
+
#include "collectd.h"
#include "collectd.h"
+
+#include "testing.h"
#include "utils_format_json.h"
#include "common.h" /* for STATIC_ARRAY_SIZE */
#include "utils_format_json.h"
#include "common.h" /* for STATIC_ARRAY_SIZE */
@@
-34,25
+47,23
@@
#if HAVE_YAJL_YAJL_VERSION_H
# include <yajl/yajl_version.h>
#endif
#if HAVE_YAJL_YAJL_VERSION_H
# include <yajl/yajl_version.h>
#endif
-#if
defined(YAJL_MAJOR) && (YAJL_MAJOR > 1)
+#if
YAJL_MAJOR > 1
# define HAVE_YAJL_V2 1
#endif
# define HAVE_YAJL_V2 1
#endif
-struct label_s
+typedef struct
{
{
- char *key;
- char *value;
-};
-typedef struct label_s label_t;
+ char const *key;
+ char const *value;
+} label_t;
-struct test_case_s
+typedef struct
{
label_t *expected_labels;
size_t expected_labels_num;
label_t *current_label;
{
label_t *expected_labels;
size_t expected_labels_num;
label_t *current_label;
-};
-typedef struct test_case_s test_case_t;
+} test_case_t;
#if HAVE_YAJL_V2
static int test_map_key (void *ctx, unsigned char const *key, size_t key_len)
#if HAVE_YAJL_V2
static int test_map_key (void *ctx, unsigned char const *key, size_t key_len)