diff options
| author | Bryce Harrington <bryce@osg.samsung.com> | 2014-11-20 12:19:47 -0800 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2014-11-20 12:22:06 -0800 |
| commit | 2c5af590ddbb08e0a46b7e37c5f0230b1805cd37 (patch) | |
| tree | 8a44d28184791a443ecb10d980fcb71cb2c779ac /test | |
| parent | 7edc5a8844b96862b866901568eb83fa56f4755b (diff) | |
Refactor ARRAY_LENGTH macro definitions in test code
Diffstat (limited to 'test')
| -rw-r--r-- | test/any2ppm.c | 2 | ||||
| -rw-r--r-- | test/cairo-test.c | 4 | ||||
| -rw-r--r-- | test/cairo-test.h | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/test/any2ppm.c b/test/any2ppm.c index 665314f1e..b60b4d959 100644 --- a/test/any2ppm.c +++ b/test/any2ppm.c @@ -100,7 +100,7 @@ #endif #endif -#define ARRAY_LENGTH(A) (sizeof (A) / sizeof (A[0])) +#define ARRAY_LENGTH(__array) ((int) (sizeof (__array) / sizeof (__array[0]))) static int _cairo_writen (int fd, char *buf, int len) diff --git a/test/cairo-test.c b/test/cairo-test.c index 8dbf4c6af..a351b0174 100644 --- a/test/cairo-test.c +++ b/test/cairo-test.c @@ -83,10 +83,6 @@ #define TRUE !FALSE #endif -#ifndef ARRAY_LENGTH -#define ARRAY_LENGTH(__array) ((int) (sizeof (__array) / sizeof (__array[0]))) -#endif - #if ! HAVE_ALARM || ! defined(SIGALRM) #define alarm(X); #endif diff --git a/test/cairo-test.h b/test/cairo-test.h index c753728f0..7e9605f61 100644 --- a/test/cairo-test.h +++ b/test/cairo-test.h @@ -107,10 +107,6 @@ cairo_test_NaN (void) #define MAX(a, b) ((a) > (b) ? (a) : (b)) #endif -#ifndef ARRAY_LENGTH -#define ARRAY_LENGTH(__array) ((int) (sizeof (__array) / sizeof (__array[0]))) -#endif - #define CAIRO_TEST_OUTPUT_DIR "output" #define CAIRO_TEST_LOG_SUFFIX ".log" |