KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

egl/main: replace __FUNCTION__ with __func__ 

The latter is a C99 standard, and our current wrapper c99_compat.h
should handle non-compliant compilers.
Drop the c99_compat.h inclusion from eglcompiler.h altogether, as it's
no longer required.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Emil Velikov 2015-02-28 16:39:10 +00:00
parent 7bd1693877
commit d780012cd7
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/egl/main/eglapi.c
View File

@ -113,7 +113,7 @@
_eglUnlockDisplay(disp); \ _eglUnlockDisplay(disp); \
/* EGL error codes are non-zero */ \ /* EGL error codes are non-zero */ \
if (err) \ if (err) \
_eglError(err, __FUNCTION__); \ _eglError(err, __func__); \
return ret; \ return ret; \
} while (0) } while (0)
@ -131,14 +131,14 @@
#define _EGL_CHECK_DISPLAY(disp, ret, drv) \ #define _EGL_CHECK_DISPLAY(disp, ret, drv) \
do { \ do { \
drv = _eglCheckDisplay(disp, __FUNCTION__); \ drv = _eglCheckDisplay(disp, __func__); \
if (!drv) \ if (!drv) \
RETURN_EGL_ERROR(disp, 0, ret); \ RETURN_EGL_ERROR(disp, 0, ret); \
} while (0) } while (0)
#define _EGL_CHECK_OBJECT(disp, type, obj, ret, drv) \ #define _EGL_CHECK_OBJECT(disp, type, obj, ret, drv) \
do { \ do { \
drv = _eglCheck ## type(disp, obj, __FUNCTION__); \ drv = _eglCheck ## type(disp, obj, __func__); \
if (!drv) \ if (!drv) \
RETURN_EGL_ERROR(disp, 0, ret); \ RETURN_EGL_ERROR(disp, 0, ret); \
} while (0) } while (0)

8
src/egl/main/eglcompiler.h
View File

@ -31,9 +31,6 @@
#define EGLCOMPILER_INCLUDED #define EGLCOMPILER_INCLUDED
#include "c99_compat.h" /* __func__, etc. */
/** /**
* Get standard integer types * Get standard integer types
*/ */
@ -79,11 +76,6 @@
# endif # endif
#endif #endif
/* XXX: Use standard `__func__` instead */
#ifndef __FUNCTION__
# define __FUNCTION__ __func__
#endif
#define STATIC_ASSERT(COND) \ #define STATIC_ASSERT(COND) \
do { \ do { \
(void) sizeof(char [1 - 2*!(COND)]); \ (void) sizeof(char [1 - 2*!(COND)]); \