NextCloud/dlib
1
0
Fork 0
mirror of https://github.com/davisking/dlib.git synced 2024-11-01 10:14:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Davis King 2020-09-01 09:30:52 -04:00
parent 4b92804dc2
commit c14ba4847e
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlib/dir_nav/dir_nav_kernel_2.cpp
View File

@ -5,7 +5,7 @@
#include "../platform.h"
#ifdef POSIX
#ifdef DLIB_POSIX
#include "dir_nav_kernel_2.h"
@ -248,7 +248,7 @@ namespace dlib
}
#endif // POSIX
#endif // DLIB_POSIX
#endif // DLIB_DIR_NAV_KERNEL_2_CPp_

4
dlib/gui_core/gui_core_kernel_2.cpp
View File

@ -4,7 +4,7 @@
#define DLIB_GUI_CORE_KERNEL_2_CPp_
#include "../platform.h"
#ifdef POSIX
#ifdef DLIB_POSIX
#include "gui_core_kernel_2.h"
@ -1990,7 +1990,7 @@ namespace dlib
// ----------------------------------------------------------------------------------------
#endif // POSIX
#endif // DLIB_POSIX
#endif // DLIB_GUI_CORE_KERNEL_2_CPp_

4
dlib/gui_widgets/nativefont.h
View File

@ -20,7 +20,7 @@
#if defined(WIN32)
#include <windows.h>
#include <mbstring.h>
#elif defined(POSIX)
#elif defined(DLIB_POSIX)
#include <stdint.h>
#include <stdio.h>
#include <string.h>
@ -295,7 +295,7 @@ namespace nativefont
~vals_internal(){
destroy();
}
#elif defined(POSIX)
#elif defined(DLIB_POSIX)
XImage *ximg;
Display *d;
GC gc;

4
dlib/misc_api/misc_api_kernel_2.cpp
View File

@ -4,7 +4,7 @@
#define DLIB_MISC_API_KERNEL_2_CPp_
#include "../platform.h"
#ifdef POSIX
#ifdef DLIB_POSIX
#include <unistd.h>
#include "misc_api_kernel_2.h"
@ -117,7 +117,7 @@ namespace dlib
// ----------------------------------------------------------------------------------------
}
#endif // POSIX
#endif // DLIB_POSIX
#endif // DLIB_MISC_API_KERNEL_2_CPp_

8
dlib/platform.h
View File

@ -12,7 +12,7 @@
/*!
This file ensures that:
- 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
- MACOSX will be defined
- if (this is also HP-UX) then
@ -36,9 +36,9 @@
#ifndef WIN32
// since this is the only other platform the library currently supports
// just assume it is POSIX if it isn't WIN32
#ifndef POSIX
#define POSIX
// just assume it is DLIB_POSIX if it isn't WIN32
#ifndef DLIB_POSIX
#define DLIB_POSIX
#endif
#ifndef HPUX

4
dlib/sockets/sockets_kernel_2.cpp
View File

@ -5,7 +5,7 @@
#include "../platform.h"
#ifdef POSIX
#ifdef DLIB_POSIX
#include "sockets_kernel_2.h"
@ -1104,7 +1104,7 @@ namespace dlib
}
#endif // POSIX
#endif // DLIB_POSIX
#endif // DLIB_SOCKETS_KERNEL_2_CPp_

4
dlib/threads/threads_kernel_2.cpp
View File

@ -5,7 +5,7 @@
#include "../platform.h"
#ifdef POSIX
#ifdef DLIB_POSIX
#include "threads_kernel_2.h"
@ -69,7 +69,7 @@ namespace dlib
}
#endif // POSIX
#endif // DLIB_POSIX
#endif // DLIB_THREADS_KERNEL_2_CPp_

2
docs/docs/term_index.xml
View File

@ -966,7 +966,7 @@
<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="HPUX" include="dlib/platform.h"/>
<term link="dlib/platform.h.html" name="WIN32" include="dlib/platform.h"/>