Mercurial > code
changeset 248:d157f4747676
Directory: fix _WIN32
DynLib: fix _WIN32
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 01 Oct 2014 14:37:42 +0200 |
parents | 3c12f0e8bbb9 |
children | 3b4ae8feca1c |
files | C++/Directory.cpp C++/DynLib.cpp C++/DynLib.h |
diffstat | 3 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/C++/Directory.cpp Sun Sep 28 21:15:26 2014 +0200 +++ b/C++/Directory.cpp Wed Oct 01 14:37:42 2014 +0200 @@ -17,10 +17,11 @@ */ #include <sstream> +#include <stdexcept> #include "Directory.h" -#if defined(_MSC_VER) +#if defined(_WIN32) # include <Windows.h> #else # include <cstring> @@ -30,7 +31,7 @@ # include <dirent.h> #endif -#if defined(_MSC_VER) +#if defined(_WIN32) namespace {
--- a/C++/DynLib.cpp Sun Sep 28 21:15:26 2014 +0200 +++ b/C++/DynLib.cpp Wed Oct 01 14:37:42 2014 +0200 @@ -18,7 +18,7 @@ #include <stdexcept> -#if defined(_MSC_VER) +#if defined(_WIN32) # include <Windows.h> #else # include <dlfcn.h> @@ -26,7 +26,7 @@ #include "DynLib.h" -#if defined(_MSC_VER) +#if defined(_WIN32) namespace {
--- a/C++/DynLib.h Sun Sep 28 21:15:26 2014 +0200 +++ b/C++/DynLib.h Wed Oct 01 14:37:42 2014 +0200 @@ -21,7 +21,7 @@ #include <string> -#if defined(_MSC_VER) +#if defined(_WIN32) # include <Windows.h> # define EXPORT __declspec(dllexport) #else @@ -37,7 +37,7 @@ */ class DynLib { public: -#if defined(_MSC_VER) +#if defined(_WIN32) using Handle = HMODULE; using Sym = FARPROC; #else