Corrected issue with dirent.h inclusion...
...and MacOSX OBJC types definition...
This commit is contained in:
parent
2652e7d1c1
commit
717cf77129
2 changed files with 2 additions and 2 deletions
|
@ -125,7 +125,7 @@
|
||||||
#include <ctype.h> // Required for: tolower() [Used in IsFileExtension()]
|
#include <ctype.h> // Required for: tolower() [Used in IsFileExtension()]
|
||||||
|
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER)
|
||||||
#include <external/dirent.h> // Required for: DIR, opendir(), closedir() [Used in GetDirectoryFiles()]
|
#include "external/dirent.h" // Required for: DIR, opendir(), closedir() [Used in GetDirectoryFiles()]
|
||||||
#else
|
#else
|
||||||
#include <dirent.h> // Required for: DIR, opendir(), closedir() [Used in GetDirectoryFiles()]
|
#include <dirent.h> // Required for: DIR, opendir(), closedir() [Used in GetDirectoryFiles()]
|
||||||
#endif
|
#endif
|
||||||
|
|
2
src/external/glfw/include/GLFW/glfw3native.h
vendored
2
src/external/glfw/include/GLFW/glfw3native.h
vendored
|
@ -102,7 +102,7 @@ extern "C" {
|
||||||
#import <Cocoa/Cocoa.h>
|
#import <Cocoa/Cocoa.h>
|
||||||
#else
|
#else
|
||||||
// RAY: Added protection in case OBJC types defined
|
// RAY: Added protection in case OBJC types defined
|
||||||
#if !defined(OBJC_TYPES_DEFINED)
|
#if !OBJC_TYPES_DEFINED
|
||||||
typedef void* id;
|
typedef void* id;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue