aboutsummaryrefslogtreecommitdiff
path: root/src/headers.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/headers.h')
-rw-r--r--src/headers.h21
1 files changed, 7 insertions, 14 deletions
diff --git a/src/headers.h b/src/headers.h
index fd086faee8..ceee028977 100644
--- a/src/headers.h
+++ b/src/headers.h
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2011 The Bitcoin developers
+// Copyright (c) 2009-2012 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
@@ -12,18 +12,17 @@
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
-#define _WIN32_WINNT 0x0500
+#define _WIN32_WINNT 0x0501
#ifdef _WIN32_IE
#undef _WIN32_IE
#endif
#define _WIN32_IE 0x0400
#define WIN32_LEAN_AND_MEAN 1
-
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
// Include boost/foreach here as it defines __STDC_LIMIT_MACROS on some systems.
#include <boost/foreach.hpp>
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS // to enable UINT64_MAX from stdint.h
-#endif
#if (defined(__unix__) || defined(unix)) && !defined(USG)
#include <sys/param.h> // to get BSD define
@@ -44,7 +43,6 @@
#include <stdlib.h>
#include <time.h>
#include <math.h>
-#include <limits.h>
#include <float.h>
#include <assert.h>
#include <iostream>
@@ -83,16 +81,11 @@
#endif
-#pragma hdrstop
-
#include "serialize.h"
#include "uint256.h"
#include "util.h"
#include "bignum.h"
#include "base58.h"
#include "main.h"
-#ifdef QT_GUI
-#include "qtui.h"
-#else
-#include "noui.h"
-#endif
+#include "wallet.h"
+#include "ui_interface.h"