aboutsummaryrefslogtreecommitdiff
path: root/headers.h
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-08-12 21:13:43 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-08-12 21:13:43 +0000
commit01cd2fdaf3ac6071304ceb80fb7436ac02b1059e (patch)
treee3fea40a86ff7d711b02ff00254445a4a64f0436 /headers.h
parent42877327973889c6a99f07025bd1bc72cf6dd2b7 (diff)
fix -datadir=./subdir relative path,
autostart off by default except on windows, fix occasional "vector iterator not dereferencable" assertion with msvc, fix readlink compile warning on linux build, use sys/param.h and BSD define instead of __BSD__, -paytxfee switch git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@130 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'headers.h')
-rw-r--r--headers.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/headers.h b/headers.h
index a0b4c5edcf..5c9e6e324a 100644
--- a/headers.h
+++ b/headers.h
@@ -18,6 +18,14 @@
#define _WIN32_IE 0x0400
#define WIN32_LEAN_AND_MEAN 1
#define __STDC_LIMIT_MACROS // to enable UINT64_MAX from stdint.h
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h> // to get BSD define
+#endif
+#ifdef __WXMAC_OSX__
+#ifndef BSD
+#define BSD 1
+#endif
+#endif
#ifdef GUI
#include <wx/wx.h>
#include <wx/stdpaths.h>
@@ -25,12 +33,6 @@
#include <wx/utils.h>
#include <wx/clipbrd.h>
#include <wx/taskbar.h>
-#else
-#ifdef __WXMAC_OSX__
-#define __WXMAC__ 1
-#define __WXOSX__ 1
-#define __BSD__ 1
-#endif
#endif
#include <openssl/buffer.h>
#include <openssl/ecdsa.h>
@@ -98,7 +100,7 @@
#include <ifaddrs.h>
#include <fcntl.h>
#endif
-#ifdef __BSD__
+#ifdef BSD
#include <netinet/in.h>
#endif