diff options
author | Akos Kiss <akiss@inf.u-szeged.hu> | 2016-04-18 17:09:15 +0200 |
---|---|---|
committer | Akos Kiss <akiss@inf.u-szeged.hu> | 2016-04-18 19:20:49 +0200 |
commit | 3a8d3b3bccdd0c3bd11b76b2455522ee22eefc89 (patch) | |
tree | 8722f976227f24f3995a9d493a6a14ae8d026022 /jerry-libc | |
parent | df1e428c71b5fbf8e4ecff38687f2877e1b12dfb (diff) |
Unifiy the comments of preprocessor conditionals
JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
Diffstat (limited to 'jerry-libc')
-rw-r--r-- | jerry-libc/arch/arm-v7.h | 4 | ||||
-rw-r--r-- | jerry-libc/include/assert.h | 6 | ||||
-rw-r--r-- | jerry-libc/include/setjmp.h | 4 | ||||
-rw-r--r-- | jerry-libc/include/stdio.h | 4 | ||||
-rw-r--r-- | jerry-libc/include/stdlib.h | 4 | ||||
-rw-r--r-- | jerry-libc/include/string.h | 4 | ||||
-rw-r--r-- | jerry-libc/include/sys/time.h | 4 | ||||
-rw-r--r-- | jerry-libc/target/posix/jerry-asm.S | 8 | ||||
-rw-r--r-- | jerry-libc/target/posix/jerry-libc-target.c | 10 |
9 files changed, 24 insertions, 24 deletions
diff --git a/jerry-libc/arch/arm-v7.h b/jerry-libc/arch/arm-v7.h index 21ae8f90..5d614e6e 100644 --- a/jerry-libc/arch/arm-v7.h +++ b/jerry-libc/arch/arm-v7.h @@ -1,4 +1,4 @@ -/* Copyright 2014-2015 Samsung Electronics Co., Ltd. +/* Copyright 2014-2016 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -112,7 +112,7 @@ #else /* !__TARGET_HOST_ARMv7_HARD_FLOAT */ # define _STORE_VFP_S16_S31_IF_HARD_FLOAT # define _LOAD_VFP_S16_S31_IF_HARD_FLOAT -#endif /* !__TARGET_HOST_ARMv7_HARD_FLOAT */ +#endif /* __TARGET_HOST_ARMv7_HARD_FLOAT */ /* * setjmp diff --git a/jerry-libc/include/assert.h b/jerry-libc/include/assert.h index 382029ec..a63c08c6 100644 --- a/jerry-libc/include/assert.h +++ b/jerry-libc/include/assert.h @@ -23,7 +23,7 @@ #ifdef __cplusplus extern "C" { -#endif /* !__cplusplus */ +#endif /* __cplusplus */ #ifndef NDEBUG #define assert(x) \ @@ -35,11 +35,11 @@ extern "C" abort (); \ } \ } while (0) -#else +#else /* NDEBUG */ #define assert(x) ((void) 0) #endif /* !NDEBUG */ #ifdef __cplusplus } -#endif /* !__cplusplus */ +#endif /* __cplusplus */ #endif /* !JERRY_LIBC_ASSERT_H */ diff --git a/jerry-libc/include/setjmp.h b/jerry-libc/include/setjmp.h index 62f56ea5..4705858f 100644 --- a/jerry-libc/include/setjmp.h +++ b/jerry-libc/include/setjmp.h @@ -22,7 +22,7 @@ #ifdef __cplusplus extern "C" { -#endif /* !__cplusplus */ +#endif /* __cplusplus */ /** * Storage for context, used for nonlocal goto @@ -61,5 +61,5 @@ void longjmp (jmp_buf env, int val); #ifdef __cplusplus } -#endif /* !__cplusplus */ +#endif /* __cplusplus */ #endif /* !JERRY_LIBC_SETJMP_H */ diff --git a/jerry-libc/include/stdio.h b/jerry-libc/include/stdio.h index dd3eeac0..4975d0a5 100644 --- a/jerry-libc/include/stdio.h +++ b/jerry-libc/include/stdio.h @@ -23,7 +23,7 @@ #ifdef __cplusplus extern "C" { -#endif /* !__cplusplus */ +#endif /* __cplusplus */ /** * File descriptor type @@ -62,5 +62,5 @@ int putchar (int c); #ifdef __cplusplus } -#endif /* !__cplusplus */ +#endif /* __cplusplus */ #endif /* !JERRY_LIBC_STDIO_H */ diff --git a/jerry-libc/include/stdlib.h b/jerry-libc/include/stdlib.h index cc73ad44..26bcc9e5 100644 --- a/jerry-libc/include/stdlib.h +++ b/jerry-libc/include/stdlib.h @@ -20,7 +20,7 @@ #ifdef __cplusplus extern "C" { -#endif /* !__cplusplus */ +#endif /* __cplusplus */ /** * Maximum integer that could be returned by random number generator @@ -37,5 +37,5 @@ void srand (unsigned int); #ifdef __cplusplus } -#endif /* !__cplusplus */ +#endif /* __cplusplus */ #endif /* !JERRY_LIBC_STDLIB_H */ diff --git a/jerry-libc/include/string.h b/jerry-libc/include/string.h index e9ff8c52..9f4212d1 100644 --- a/jerry-libc/include/string.h +++ b/jerry-libc/include/string.h @@ -22,7 +22,7 @@ #ifdef __cplusplus extern "C" { -#endif /* !__cplusplus */ +#endif /* __cplusplus */ void *memcpy (void *dest, const void *src, size_t n); void *memset (void *s, int c, size_t n); @@ -35,5 +35,5 @@ size_t strlen (const char *s); #ifdef __cplusplus } -#endif /* !__cplusplus */ +#endif /* __cplusplus */ #endif /* !JERRY_LIBC_STRING_H */ diff --git a/jerry-libc/include/sys/time.h b/jerry-libc/include/sys/time.h index 986adea2..eb929a90 100644 --- a/jerry-libc/include/sys/time.h +++ b/jerry-libc/include/sys/time.h @@ -20,7 +20,7 @@ #ifdef __cplusplus extern "C" { -#endif /* !__cplusplus */ +#endif /* __cplusplus */ /** * Time value structure @@ -44,5 +44,5 @@ int gettimeofday (void *tp, void *tzp); #ifdef __cplusplus } -#endif /* !__cplusplus */ +#endif /* __cplusplus */ #endif /* !JERRY_LIBC_TIME_H */ diff --git a/jerry-libc/target/posix/jerry-asm.S b/jerry-libc/target/posix/jerry-asm.S index afd44bee..470b6212 100644 --- a/jerry-libc/target/posix/jerry-asm.S +++ b/jerry-libc/target/posix/jerry-asm.S @@ -20,9 +20,9 @@ #include "arch/x86-32.h" #elif defined (__TARGET_HOST_ARMv7) #include "arch/arm-v7.h" -#else +#else /* !__TARGET_HOST_x64 && !__TARGET_HOST_x86 && !__TARGET_HOST_ARMv7 */ #error "Unsupported architecture" -#endif /* !__TARGET_HOST_x64 && !__TARGET_HOST_x86 && !__TARGET_HOST_ARMv7 */ +#endif /* __TARGET_HOST_x64 */ #if defined (__linux__) .macro func _name @@ -40,9 +40,9 @@ .endm .macro endfunc _name .endm -#else +#else /* !__linux && !(__APPLE__ && __MACH__) */ #error "Unsupported OS" -#endif /* !__linux && !(__APPLE__ && __MACH__) */ +#endif /* __linux__ */ func _start _START diff --git a/jerry-libc/target/posix/jerry-libc-target.c b/jerry-libc/target/posix/jerry-libc-target.c index c169280d..beaefd72 100644 --- a/jerry-libc/target/posix/jerry-libc-target.c +++ b/jerry-libc/target/posix/jerry-libc-target.c @@ -35,9 +35,9 @@ #elif defined (__APPLE__) && defined (__MACH__) #define SYS_exit_group SYS_exit #define SYSCALL_NO(NAME) SYS_ ## NAME -#else +#else /* !__linux && !(__APPLE__ && __MACH__) */ #error "Unsupported OS" -#endif /* !__linux && !(__APPLE__ && __MACH__) */ +#endif /* __linux__ */ #include "jerry-libc-defs.h" @@ -355,7 +355,7 @@ jrt_set_mem_limits (size_t data_size, /**< limit for data + bss + brk heap */ long int ret; -#ifdef __TARGET_HOST_x64 +#if defined (__TARGET_HOST_x64) ret = syscall_2 (SYSCALL_NO (setrlimit), RLIMIT_DATA, (intptr_t) &data_limit); assert (ret == 0); @@ -371,6 +371,6 @@ jrt_set_mem_limits (size_t data_size, /**< limit for data + bss + brk heap */ # error "__TARGET_HOST_x86 case is not implemented" #else /* !__TARGET_HOST_x64 && !__TARGET_HOST_ARMv7 && !__TARGET_HOST_x86 */ # error "!__TARGET_HOST_x64 && !__TARGET_HOST_ARMv7 && !__TARGET_HOST_x86" -#endif /* !__TARGET_HOST_x64 && !__TARGET_HOST_ARMv7 && !__TARGET_HOST_x86 */ +#endif /* __TARGET_HOST_x64 */ } /* jrt_set_mem_limits */ -#endif // FIXME +#endif /* 0 */ |