cmocka: Include cmocka_private.h after cmocka.h

cmocka_private.h uses WORDSIZE:
    # if __WORDSIZE == 64
        #  define __PRI64_PREFIX "l"

But on some platforms, like Solaris, cmocka guesses its own WORDSIZE
value in cmocka.h. Therefore it's important to include cmocka_private.h
after cmocka.h

diff --git a/src/cmocka.c b/src/cmocka.c
index 626b33e53673667f564d06b3fd4f32665d170ffc..9d3e7045dcd9d5275fb2bcf2fea0be2d00669c26 100644 (file)
--- a/src/cmocka.c
+++ b/src/cmocka.c
@@ -54,8 +54,8 @@
 # include "cmocka_platform.h"
 #endif /* CMOCKA_PLATFORM_INCLUDE */
 
-#include <cmocka_private.h>
 #include <cmocka.h>
+#include <cmocka_private.h>
 
 /* Size of guard bytes around dynamically allocated blocks. */
 #define MALLOC_GUARD_SIZE 16

diff --git a/tests/test_alloc.c b/tests/test_alloc.c
index e1642afe7c7b28a16cdf51d07686ca5cb02f51ff..babe3a80de5f26258fe865aa8e2fc02b6acbd132 100644 (file)
--- a/tests/test_alloc.c
+++ b/tests/test_alloc.c
@@ -3,8 +3,8 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
-#include <cmocka_private.h>
 #include <cmocka.h>
+#include <cmocka_private.h>
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/tests/test_assert_macros.c b/tests/test_assert_macros.c
index 560f9cf8b4db7d19c2781f0ccd490a73e7d74fbc..85b0a38866910671e8d069a22867e933a2cff44d 100644 (file)
--- a/tests/test_assert_macros.c
+++ b/tests/test_assert_macros.c
@@ -3,8 +3,8 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
-#include <cmocka_private.h>
 #include <cmocka.h>
+#include <cmocka_private.h>
 
 #include <errno.h>
 #include <sys/types.h>

diff --git a/tests/test_assert_macros_fail.c b/tests/test_assert_macros_fail.c
index fea3df572bcc955ecdae2e639af6995f0400d04a..aea919a5ce721a0550184256ee4e6901c08e2d22 100644 (file)
--- a/tests/test_assert_macros_fail.c
+++ b/tests/test_assert_macros_fail.c
@@ -3,8 +3,8 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
-#include <cmocka_private.h>
 #include <cmocka.h>
+#include <cmocka_private.h>
 
 #include <errno.h>
 #include <sys/types.h>