diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-08-18 22:57:34 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-08-18 22:57:53 +0200 |
| commit | ee8f131b49bb9b1d66cac3840b3c566eb49bcf3f (patch) | |
| tree | 26c428345270d62c0bbc0045fc3f7de73aab0ba9 /src/log.cpp | |
| parent | d8d9232a67a03548b827bdb0515fe7a620a488f8 (diff) | |
| parent | 4b30182fc569f99925d6c73b9235fa728afa4ce8 (diff) | |
| download | mana-client-ee8f131b49bb9b1d66cac3840b3c566eb49bcf3f.tar.gz mana-client-ee8f131b49bb9b1d66cac3840b3c566eb49bcf3f.tar.bz2 mana-client-ee8f131b49bb9b1d66cac3840b3c566eb49bcf3f.tar.xz mana-client-ee8f131b49bb9b1d66cac3840b3c566eb49bcf3f.zip | |
Merge branch '1.0'
Conflicts:
src/log.cpp
Diffstat (limited to 'src/log.cpp')
| -rw-r--r-- | src/log.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/log.cpp b/src/log.cpp index 0da9a272..a147c107 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -19,23 +19,20 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <iostream> -#include <sstream> - -#include <stdio.h> -#include <stdarg.h> - #include "log.h" #ifdef WIN32 #include <windows.h> #elif __APPLE__ #include <Carbon/Carbon.h> -#elif __linux__ || __linux -#include <stdlib.h> #endif #include <sys/time.h> +#include <iostream> +#include <sstream> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> Logger::Logger(): mLogToStandardOut(true) |