archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2026-02-07 14:38:45 +00:00
Code Issues Projects Releases Wiki Activity

Use __func__ instead of __FUNCTION__

Browse Source 
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
This commit is contained in:
Peter Gal 2015-06-09 18:03:42 +02:00
parent d988da8edf
commit f6b875c36c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jerry-core/jrt/jrt.h
View File

@ -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<typename... values> 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__); \

4
jerry-libc/jerry-libc-defs.h
View File

@ -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)

2
jerry-libc/target/linux/jerry-libc-target.c
View File

@ -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);