Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
c14ba484
Commit
c14ba484
authored
Sep 01, 2020
by
Davis King
Browse files
Rename POSIX macro to DLIB_POSIX to avoid name clashes with some libraries.
parent
4b92804d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
17 additions
and
17 deletions
+17
-17
dlib/dir_nav/dir_nav_kernel_2.cpp
dlib/dir_nav/dir_nav_kernel_2.cpp
+2
-2
dlib/gui_core/gui_core_kernel_2.cpp
dlib/gui_core/gui_core_kernel_2.cpp
+2
-2
dlib/gui_widgets/nativefont.h
dlib/gui_widgets/nativefont.h
+2
-2
dlib/misc_api/misc_api_kernel_2.cpp
dlib/misc_api/misc_api_kernel_2.cpp
+2
-2
dlib/platform.h
dlib/platform.h
+4
-4
dlib/sockets/sockets_kernel_2.cpp
dlib/sockets/sockets_kernel_2.cpp
+2
-2
dlib/threads/threads_kernel_2.cpp
dlib/threads/threads_kernel_2.cpp
+2
-2
docs/docs/term_index.xml
docs/docs/term_index.xml
+1
-1
No files found.
dlib/dir_nav/dir_nav_kernel_2.cpp
View file @
c14ba484
...
@@ -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_
dlib/gui_core/gui_core_kernel_2.cpp
View file @
c14ba484
...
@@ -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_
dlib/gui_widgets/nativefont.h
View file @
c14ba484
...
@@ -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
;
...
...
dlib/misc_api/misc_api_kernel_2.cpp
View file @
c14ba484
...
@@ -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_
dlib/platform.h
View file @
c14ba484
...
@@ -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
...
...
dlib/sockets/sockets_kernel_2.cpp
View file @
c14ba484
...
@@ -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_
dlib/threads/threads_kernel_2.cpp
View file @
c14ba484
...
@@ -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_
docs/docs/term_index.xml
View file @
c14ba484
...
@@ -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"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment