Fix filewatcher RemoveDirectory issue.
Windows headers define RemoveDirectory as RemoveDirectoryA. system/FileWatcher.h needs to be included after any headers that might include windows headers.
This commit is contained in:
@@ -1,16 +1,15 @@
|
|||||||
#ifndef LIME_SYSTEM_FILE_WATCHER_H
|
#ifndef LIME_SYSTEM_FILE_WATCHER_H
|
||||||
#define LIME_SYSTEM_FILE_WATCHER_H
|
#define LIME_SYSTEM_FILE_WATCHER_H
|
||||||
|
|
||||||
#ifdef RemoveDirectory
|
|
||||||
#undef RemoveDirectory
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <system/CFFI.h>
|
#include <system/CFFI.h>
|
||||||
#include <system/Mutex.h>
|
#include <system/Mutex.h>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
#ifdef RemoveDirectory
|
||||||
|
#undef RemoveDirectory
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace lime {
|
namespace lime {
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#include <system/FileWatcher.h>
|
// include order is important
|
||||||
#include <efsw/efsw.hpp>
|
#include <efsw/efsw.hpp>
|
||||||
|
#include <system/FileWatcher.h>
|
||||||
|
|
||||||
|
|
||||||
namespace lime {
|
namespace lime {
|
||||||
|
|||||||
Reference in New Issue
Block a user