summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChia-I Wu <olvaffe@gmail.com>2010-01-20 17:42:33 +0800
committerChia-I Wu <olvaffe@gmail.com>2010-01-20 17:44:11 +0800
commit925f8113beba03e956351cee6780b1c7ab76add8 (patch)
tree7a8f37f799602b16c7c3c7001a1e781d52ce3349
parentf0c2871bf4f6fa89339347bb9767bb2c19fda6d0 (diff)
egl: Rename _EGL_PLATFORM_X to _EGL_PLATFORM_POSIX.
The macro is used to determine if dlfcn.h or dirent.h is available. POSIX is a better name than X in such case.
-rw-r--r--src/egl/main/Makefile2
-rw-r--r--src/egl/main/egldriver.c16
2 files changed, 9 insertions, 9 deletions
diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 7386f6ea73..66f8f01b8e 100644
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -47,7 +47,7 @@ OBJECTS = $(SOURCES:.c=.o)
# use dl*() to load drivers
-LOCAL_CFLAGS = -D_EGL_PLATFORM_X=1
+LOCAL_CFLAGS = -D_EGL_PLATFORM_POSIX=1
EGL_DEFAULT_DISPLAY = $(word 1, $(EGL_DISPLAYS))
diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index 873dac02bf..dd363a18f4 100644
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -20,7 +20,7 @@
#include "eglstring.h"
#include "eglsurface.h"
-#if defined(_EGL_PLATFORM_X)
+#if defined(_EGL_PLATFORM_POSIX)
#include <dlfcn.h>
#include <sys/types.h>
#include <dirent.h>
@@ -58,7 +58,7 @@ library_suffix(void)
}
-#elif defined(_EGL_PLATFORM_X)
+#elif defined(_EGL_PLATFORM_POSIX)
static const char DefaultDriverName[] = "egl_softpipe";
@@ -132,7 +132,7 @@ _eglOpenLibrary(const char *driverPath, lib_handle *handle)
/* XXX untested */
if (lib)
mainFunc = (_EGLMain_t) GetProcAddress(lib, "_eglMain");
-#elif defined(_EGL_PLATFORM_X)
+#elif defined(_EGL_PLATFORM_POSIX)
if (lib) {
mainFunc = (_EGLMain_t) dlsym(lib, "_eglMain");
if (!mainFunc)
@@ -276,7 +276,7 @@ _eglCloseDriver(_EGLDriver *drv, _EGLDisplay *dpy)
static EGLBoolean
_eglPreloadUserDriver(void)
{
-#if defined(_EGL_PLATFORM_X) || defined(_EGL_PLATFORM_WINDOWS)
+#if defined(_EGL_PLATFORM_POSIX) || defined(_EGL_PLATFORM_WINDOWS)
_EGLDriver *drv;
char *env, *path;
const char *suffix, *p;
@@ -312,7 +312,7 @@ _eglPreloadUserDriver(void)
_eglGlobal.Drivers[_eglGlobal.NumDrivers++] = drv;
return EGL_TRUE;
-#else /* _EGL_PLATFORM_X || _EGL_PLATFORM_WINDOWS */
+#else /* _EGL_PLATFORM_POSIX || _EGL_PLATFORM_WINDOWS */
return EGL_FALSE;
#endif
}
@@ -330,7 +330,7 @@ _eglPreloadUserDriver(void)
static EGLBoolean
_eglPreloadDisplayDrivers(void)
{
-#if defined(_EGL_PLATFORM_X)
+#if defined(_EGL_PLATFORM_POSIX)
const char *dpy, *suffix;
char path[1024], prefix[32];
DIR *dirp;
@@ -375,7 +375,7 @@ _eglPreloadDisplayDrivers(void)
closedir(dirp);
return (_eglGlobal.NumDrivers > 0);
-#else /* _EGL_PLATFORM_X */
+#else /* _EGL_PLATFORM_POSIX */
return EGL_FALSE;
#endif
}
@@ -532,7 +532,7 @@ _eglFindAPIs(void)
const char *es2_libname = "libGLESv2.dll";
const char *gl_libname = "OpenGL32.dll";
const char *vg_libname = "libOpenVG.dll";
-#elif defined(_EGL_PLATFORM_X)
+#elif defined(_EGL_PLATFORM_POSIX)
const char *es1_libname = "libGLESv1_CM.so";
const char *es2_libname = "libGLESv2.so";
const char *gl_libname = "libGL.so";