mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove platform_spec_selector.cpp and bedrock_selector.cpp

Browse Source
This commit is contained in:
Jinhao
2015-12-05 15:52:31 +08:00
parent 3863a0dc60
commit dce320d544
15 changed files with 49 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/nana/config.hpp
View File

@@ -18,7 +18,7 @@
// Windows:
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
#define NANA_WINDOWS 1
#define NANA_WINDOWS
// MINGW ...
#if defined(__MINGW32__) || defined(__MINGW64__) || defined(MINGW)
@@ -31,24 +31,23 @@
// MacOS: who define APPLE ??
//#define APPLE
#elif defined(APPLE)
#define NANA_MACOS 1
#define NANA_X11 1
#define NANA_MACOS
#define NANA_X11
// how to add this: include_directories(/opt/X11/include/)
// end MacOS
// Linux: (not sure about __GNU__ ??)
#elif (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC)
#define NANA_LINUX 1
#define NANA_X11 1
#define NANA_LINUX
#define NANA_X11
// end Linux
#else
# static_assert(false, "Only Windows and Unix are supported now (Mac OS is experimental)");
#endif // Select platform
#if defined(NANA_LINUX) || defined(NANA_MACOS)
#undef NANA_WINDOWS
#define NANA_POSIX
#undef NANA_WINDOWS
#endif
// End Select platform ......

2
include/nana/filesystem/file_iterator.hpp
View File

@@ -38,7 +38,7 @@ namespace filesystem
fileinfo();
#ifdef NANA_WINDOWS
fileinfo(const WIN32_FIND_DATA& wfd);
#elif NANA_LINUX or NANA_MACOS
#elif defined(NANA_POSIX)
fileinfo(const nana::string& filename, const struct stat &);
#endif
nana::string name;