summaryrefslogtreecommitdiff
path: root/library/Console-linux.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2011-07-16 08:00:13 +0200
committerPetr Mrázek2011-07-16 08:00:13 +0200
commit003ad63c56653e421b4570ab71c648df9d4efd98 (patch)
treec8312aa955763a69ccdadd9f478f5b13d1837bfb /library/Console-linux.cpp
parentfd418cd2dcbc0a602ddfe3cb160a6cf2312c8cb5 (diff)
downloaddfhack-003ad63c56653e421b4570ab71c648df9d4efd98.tar.gz
dfhack-003ad63c56653e421b4570ab71c648df9d4efd98.tar.bz2
dfhack-003ad63c56653e421b4570ab71c648df9d4efd98.tar.xz
Disabled ctrl+c on windows (null signal handler). Some small fixes.
Diffstat (limited to 'library/Console-linux.cpp')
-rw-r--r--library/Console-linux.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/Console-linux.cpp b/library/Console-linux.cpp
index acbf5b11..4679f683 100644
--- a/library/Console-linux.cpp
+++ b/library/Console-linux.cpp
@@ -1,6 +1,5 @@
/*
https://github.com/peterix/dfhack
-Copyright (c) 2011 Petr Mrázek <peterix@gmail.com>
A thread-safe logging console with a line editor.
@@ -19,6 +18,7 @@ the 2010 UNIX computers around.
Copyright (c) 2010, Salvatore Sanfilippo <antirez at gmail dot com>
Copyright (c) 2010, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+Copyright (c) 2011, Petr Mrázek <peterix@gmail.com>
All rights reserved.
@@ -47,9 +47,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "dfhack/Console.h"
-#include "dfhack/extra/stdiostream.h"
#include <cstdio>
#include <cstdlib>
+#include <iostream>
#include <sstream>
#include <stdio.h>
#include <string.h>