From f6b875c36c34d26394557d1c36b21cbde2676428 Mon Sep 17 00:00:00 2001 From: Peter Gal Date: Tue, 9 Jun 2015 18:03:42 +0200 Subject: [PATCH] Use __func__ instead of __FUNCTION__ The __FUNCTION__ is not part of the C99/C++11 standard. So replace all occurrences with the standard __func__. Side note: GCC 5.1 warns when using -Wpedantic -std=c99 and __FUNCTION__. JerryScript-DCO-1.0-Signed-off-by: Peter Gal pgal.u-szeged@partner.samsung.com --- jerry-core/jrt/jrt.h | 8 ++++---- jerry-libc/jerry-libc-defs.h | 4 ++-- jerry-libc/target/linux/jerry-libc-target.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jerry-core/jrt/jrt.h b/jerry-core/jrt/jrt.h index 170b5ba186..5cc7a8e208 100644 --- a/jerry-core/jrt/jrt.h +++ b/jerry-core/jrt/jrt.h @@ -88,7 +88,7 @@ extern void __noreturn jerry_unimplemented (const char *comment, const char *fil #ifndef JERRY_NDEBUG #define JERRY_ASSERT(x) do { if (__builtin_expect (!(x), 0)) { \ - jerry_assert_fail (#x, __FILE__, __FUNCTION__, __LINE__); } } while (0) + jerry_assert_fail (#x, __FILE__, __func__, __LINE__); } } while (0) #else /* !JERRY_NDEBUG */ #define JERRY_ASSERT(x) do { if (false) { (void)(x); } } while (0) #endif /* !JERRY_NDEBUG */ @@ -132,19 +132,19 @@ template extern void jerry_ref_unused_variables (const value #define JERRY_UNREACHABLE() \ do \ { \ - jerry_unreachable (NULL, __FILE__, __FUNCTION__, __LINE__); \ + jerry_unreachable (NULL, __FILE__, __func__, __LINE__); \ } while (0) #define JERRY_UNIMPLEMENTED(comment) \ do \ { \ - jerry_unimplemented (comment, __FILE__, __FUNCTION__, __LINE__); \ + jerry_unimplemented (comment, __FILE__, __func__, __LINE__); \ } while (0) #define JERRY_UNIMPLEMENTED_REF_UNUSED_VARS(comment, ...) \ do \ { \ - jerry_unimplemented (comment, __FILE__, __FUNCTION__, __LINE__); \ + jerry_unimplemented (comment, __FILE__, __func__, __LINE__); \ if (false) \ { \ jerry_ref_unused_variables (0, __VA_ARGS__); \ diff --git a/jerry-libc/jerry-libc-defs.h b/jerry-libc/jerry-libc-defs.h index 38ce12a52b..ad0a55e88b 100644 --- a/jerry-libc/jerry-libc-defs.h +++ b/jerry-libc/jerry-libc-defs.h @@ -39,11 +39,11 @@ libc_fatal (const char *msg, #ifndef LIBC_NDEBUG # define LIBC_ASSERT(x) do { if (__builtin_expect (!(x), 0)) { \ - libc_fatal (#x, __FILE__, __FUNCTION__, __LINE__); } } while (0) + libc_fatal (#x, __FILE__, __func__, __LINE__); } } while (0) # define LIBC_UNREACHABLE() \ do \ { \ - libc_fatal ("Code is unreachable", __FILE__, __FUNCTION__, __LINE__); \ + libc_fatal ("Code is unreachable", __FILE__, __func__, __LINE__); \ } while (0) #else /* !LIBC_NDEBUG */ # define LIBC_ASSERT(x) do { if (false) { (void) (x); } } while (0) diff --git a/jerry-libc/target/linux/jerry-libc-target.c b/jerry-libc/target/linux/jerry-libc-target.c index 53c20791fc..4013ecde7f 100644 --- a/jerry-libc/target/linux/jerry-libc-target.c +++ b/jerry-libc/target/linux/jerry-libc-target.c @@ -48,7 +48,7 @@ LIBC_UNREACHABLE_STUB_FOR (int raise (int sig_no __attr_unused___)) #define LIBC_EXIT_ON_ERROR(syscall_ret_val) \ if ((syscall_ret_val) < 0) \ { \ - libc_fatal ("Syscall", __FILE__, __FUNCTION__, __LINE__); \ + libc_fatal ("Syscall", __FILE__, __func__, __LINE__); \ } static long int syscall_0 (long int syscall_no);