"examples/git@developer.sourcefind.cn:OpenDAS/dgl.git" did not exist on "0d878ff8ef063e80d437c3a0535a92fd3d96d225"
Commit c14ba484 authored by Davis King's avatar Davis King
Browse files

Rename POSIX macro to DLIB_POSIX to avoid name clashes with some libraries.

parent 4b92804d
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "../platform.h" #include "../platform.h"
#ifdef POSIX #ifdef DLIB_POSIX
#include "dir_nav_kernel_2.h" #include "dir_nav_kernel_2.h"
...@@ -248,7 +248,7 @@ namespace dlib ...@@ -248,7 +248,7 @@ namespace dlib
} }
#endif // POSIX #endif // DLIB_POSIX
#endif // DLIB_DIR_NAV_KERNEL_2_CPp_ #endif // DLIB_DIR_NAV_KERNEL_2_CPp_
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#define DLIB_GUI_CORE_KERNEL_2_CPp_ #define DLIB_GUI_CORE_KERNEL_2_CPp_
#include "../platform.h" #include "../platform.h"
#ifdef POSIX #ifdef DLIB_POSIX
#include "gui_core_kernel_2.h" #include "gui_core_kernel_2.h"
...@@ -1990,7 +1990,7 @@ namespace dlib ...@@ -1990,7 +1990,7 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
#endif // POSIX #endif // DLIB_POSIX
#endif // DLIB_GUI_CORE_KERNEL_2_CPp_ #endif // DLIB_GUI_CORE_KERNEL_2_CPp_
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#if defined(WIN32) #if defined(WIN32)
#include <windows.h> #include <windows.h>
#include <mbstring.h> #include <mbstring.h>
#elif defined(POSIX) #elif defined(DLIB_POSIX)
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
...@@ -295,7 +295,7 @@ namespace nativefont ...@@ -295,7 +295,7 @@ namespace nativefont
~vals_internal(){ ~vals_internal(){
destroy(); destroy();
} }
#elif defined(POSIX) #elif defined(DLIB_POSIX)
XImage *ximg; XImage *ximg;
Display *d; Display *d;
GC gc; GC gc;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#define DLIB_MISC_API_KERNEL_2_CPp_ #define DLIB_MISC_API_KERNEL_2_CPp_
#include "../platform.h" #include "../platform.h"
#ifdef POSIX #ifdef DLIB_POSIX
#include <unistd.h> #include <unistd.h>
#include "misc_api_kernel_2.h" #include "misc_api_kernel_2.h"
...@@ -117,7 +117,7 @@ namespace dlib ...@@ -117,7 +117,7 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
} }
#endif // POSIX #endif // DLIB_POSIX
#endif // DLIB_MISC_API_KERNEL_2_CPp_ #endif // DLIB_MISC_API_KERNEL_2_CPp_
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
/*! /*!
This file ensures that: This file ensures that:
- if (we are compiling under a posix platform) then - if (we are compiling under a posix platform) then
- POSIX will be defined - DLIB_POSIX will be defined
- if (this is also Mac OS X) then - if (this is also Mac OS X) then
- MACOSX will be defined - MACOSX will be defined
- if (this is also HP-UX) then - if (this is also HP-UX) then
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
#ifndef WIN32 #ifndef WIN32
// since this is the only other platform the library currently supports // since this is the only other platform the library currently supports
// just assume it is POSIX if it isn't WIN32 // just assume it is DLIB_POSIX if it isn't WIN32
#ifndef POSIX #ifndef DLIB_POSIX
#define POSIX #define DLIB_POSIX
#endif #endif
#ifndef HPUX #ifndef HPUX
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "../platform.h" #include "../platform.h"
#ifdef POSIX #ifdef DLIB_POSIX
#include "sockets_kernel_2.h" #include "sockets_kernel_2.h"
...@@ -1104,7 +1104,7 @@ namespace dlib ...@@ -1104,7 +1104,7 @@ namespace dlib
} }
#endif // POSIX #endif // DLIB_POSIX
#endif // DLIB_SOCKETS_KERNEL_2_CPp_ #endif // DLIB_SOCKETS_KERNEL_2_CPp_
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "../platform.h" #include "../platform.h"
#ifdef POSIX #ifdef DLIB_POSIX
#include "threads_kernel_2.h" #include "threads_kernel_2.h"
...@@ -69,7 +69,7 @@ namespace dlib ...@@ -69,7 +69,7 @@ namespace dlib
} }
#endif // POSIX #endif // DLIB_POSIX
#endif // DLIB_THREADS_KERNEL_2_CPp_ #endif // DLIB_THREADS_KERNEL_2_CPp_
...@@ -966,7 +966,7 @@ ...@@ -966,7 +966,7 @@
<term file="metaprogramming.html" name="assign_zero_if_built_in_scalar_type" include="dlib/algs.h"/> <term file="metaprogramming.html" name="assign_zero_if_built_in_scalar_type" include="dlib/algs.h"/>
<term link="dlib/platform.h.html" name="POSIX" include="dlib/platform.h"/> <term link="dlib/platform.h.html" name="DLIB_POSIX" include="dlib/platform.h"/>
<term link="dlib/platform.h.html" name="MACOSX" include="dlib/platform.h"/> <term link="dlib/platform.h.html" name="MACOSX" include="dlib/platform.h"/>
<term link="dlib/platform.h.html" name="HPUX" include="dlib/platform.h"/> <term link="dlib/platform.h.html" name="HPUX" include="dlib/platform.h"/>
<term link="dlib/platform.h.html" name="WIN32" include="dlib/platform.h"/> <term link="dlib/platform.h.html" name="WIN32" include="dlib/platform.h"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment