egl: s/_EGL_PLATFORM/_EGL_OS/ and s/POSIX/UNIX/.

A platform means a native window system in EGL.  Use OS that follows
Gallium instead.

diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 82fd855b1d5bc70900f86f5eaaa97b4a2b0f1790..0af964d8741bee517e0c1bd500f8f44b237e4c28 100644 (file)
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -49,7 +49,7 @@ OBJECTS = $(SOURCES:.c=.o)
 
 
 # use dl*() to load drivers
-LOCAL_CFLAGS = -D_EGL_PLATFORM_POSIX=1
+LOCAL_CFLAGS = -D_EGL_OS_UNIX=1
 
 EGL_DEFAULT_DISPLAY = $(word 1, $(EGL_DISPLAYS))
 

diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript
index f3fe9966b3e6e71768825fff851f4e5c03343edd..a331c9711ec636d893863b7577d56898340ede72 100644 (file)
--- a/src/egl/main/SConscript
+++ b/src/egl/main/SConscript
@@ -11,7 +11,7 @@ if env['platform'] != 'winddk':
        env.Append(CPPDEFINES = [
                '_EGL_DEFAULT_DISPLAY=\\"gdi\\"',
                '_EGL_DRIVER_SEARCH_DIR=\\"\\"',
-               '_EGL_PLATFORM_WINDOWS',
+               '_EGL_OS_WINDOWS',
                'KHRONOS_DLL_EXPORTS',
        ])
 

diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index 631a8710ac5af1b01f6de0954c99b6a23d2c5d4f..ce5f0f22f05768ea64e7712b847026c4bdb7fe95 100644 (file)
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -23,7 +23,7 @@
 #include "eglsurface.h"
 #include "eglimage.h"
 
-#if defined(_EGL_PLATFORM_POSIX)
+#if defined(_EGL_OS_UNIX)
 #include <dlfcn.h>
 #include <sys/types.h>
 #include <dirent.h>
@@ -34,7 +34,7 @@
 /**
  * Wrappers for dlopen/dlclose()
  */
-#if defined(_EGL_PLATFORM_WINDOWS)
+#if defined(_EGL_OS_WINDOWS)
 
 
 /* XXX Need to decide how to do dynamic name lookup on Windows */
@@ -64,7 +64,7 @@ library_suffix(void)
 }
 
 
-#elif defined(_EGL_PLATFORM_POSIX)
+#elif defined(_EGL_OS_UNIX)
 
 
 static const char *DefaultDriverNames[] = {
@@ -119,11 +119,11 @@ _eglOpenLibrary(const char *driverPath, lib_handle *handle)
    _eglLog(_EGL_DEBUG, "dlopen(%s)", driverPath);
    lib = open_library(driverPath);
 
-#if defined(_EGL_PLATFORM_WINDOWS)
+#if defined(_EGL_OS_WINDOWS)
    /* XXX untested */
    if (lib)
       mainFunc = (_EGLMain_t) GetProcAddress(lib, "_eglMain");
-#elif defined(_EGL_PLATFORM_POSIX)
+#elif defined(_EGL_OS_UNIX)
    if (lib) {
       union {
          _EGLMain_t func;
@@ -301,7 +301,7 @@ _eglLoaderFile(const char *dir, size_t len, void *loader_data)
 static EGLBoolean
 _eglLoaderPattern(const char *dir, size_t len, void *loader_data)
 {
-#if defined(_EGL_PLATFORM_POSIX)
+#if defined(_EGL_OS_UNIX)
    const char *prefix, *suffix;
    size_t prefix_len, suffix_len;
    DIR *dirp;
@@ -352,7 +352,7 @@ _eglLoaderPattern(const char *dir, size_t len, void *loader_data)
    closedir(dirp);
 
    return EGL_TRUE;
-#else /* _EGL_PLATFORM_POSIX */
+#else /* _EGL_OS_UNIX */
    /* stop immediately */
    return EGL_FALSE;
 #endif
@@ -397,20 +397,20 @@ _eglGetSearchPath(void)
 {
    static const char *search_path;
 
-#if defined(_EGL_PLATFORM_POSIX) || defined(_EGL_PLATFORM_WINDOWS)
+#if defined(_EGL_OS_UNIX) || defined(_EGL_OS_WINDOWS)
    if (!search_path) {
       static char buffer[1024];
       const char *p;
       int ret;
 
       p = getenv("EGL_DRIVERS_PATH");
-#if defined(_EGL_PLATFORM_POSIX)
+#if defined(_EGL_OS_UNIX)
       if (p && (geteuid() != getuid() || getegid() != getgid())) {
          _eglLog(_EGL_DEBUG,
                "ignore EGL_DRIVERS_PATH for setuid/setgid binaries");
          p = NULL;
       }
-#endif /* _EGL_PLATFORM_POSIX */
+#endif /* _EGL_OS_UNIX */
 
       if (p) {
          ret = _eglsnprintf(buffer, sizeof(buffer),
@@ -441,7 +441,7 @@ _eglPreloadUserDriver(void)
    char *env;
 
    env = getenv("EGL_DRIVER");
-#if defined(_EGL_PLATFORM_POSIX)
+#if defined(_EGL_OS_UNIX)
    if (env && strchr(env, '/')) {
       search_path = "";
       if ((geteuid() != getuid() || getegid() != getgid())) {
@@ -450,7 +450,7 @@ _eglPreloadUserDriver(void)
          env = NULL;
       }
    }
-#endif /* _EGL_PLATFORM_POSIX */
+#endif /* _EGL_OS_UNIX */
    if (!env)
       return EGL_FALSE;
 

diff --git a/src/egl/main/eglstring.h b/src/egl/main/eglstring.h
index bebb758dd82b6c187ed91a9a746e7afefcc36368..f1d559b24a23362fc73e5aecea37bd2af6b42c47 100644 (file)
--- a/src/egl/main/eglstring.h
+++ b/src/egl/main/eglstring.h
@@ -3,7 +3,7 @@
 
 #include <string.h>
 
-#ifdef _EGL_PLATFORM_WINDOWS
+#ifdef _EGL_OS_WINDOWS
 #define _eglstrcasecmp _stricmp
 #define _eglsnprintf _snprintf
 #else