unix build merged in, bitmap resources from xpm instead of rc, better addr relay, better selection of addrs by time last seen for faster connect

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@32 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 27 insertions, 11 deletions

diff --git a/headers.h b/headers.h
index f00b7dde05..c7f3cd8514 100644
--- a/headers.h
+++ b/headers.h
@@ -17,16 +17,18 @@
 #endif

 #define _WIN32_IE 0x0400

 #define WIN32_LEAN_AND_MEAN 1

+#define __STDC_LIMIT_MACROS // to enable UINT64_MAX from stdint.h

 #include <wx/wx.h>

 #include <wx/clipbrd.h>

 #include <wx/snglinst.h>

 #include <wx/taskbar.h>

 #include <wx/stdpaths.h>

+#include <wx/utils.h>

 #include <openssl/ecdsa.h>

 #include <openssl/evp.h>

 #include <openssl/rand.h>

 #include <openssl/sha.h>

-#include <openssl/ripemd.h>
+#include <openssl/ripemd.h>

 #include <stdio.h>

 #include <stdlib.h>

 #include <math.h>

@@ -50,22 +52,28 @@
 #include <boost/tuple/tuple.hpp>

 #include <boost/tuple/tuple_comparison.hpp>

 #include <boost/tuple/tuple_io.hpp>

-#include <boost/array.hpp>
-
+#include <boost/array.hpp>

+

 #ifdef __WXMSW__

 #include <windows.h>

 #include <winsock2.h>

-#include <mswsock.h>
+#include <mswsock.h>

 #include <shlobj.h>

-#include <shlwapi.h>
-#include <io.h>
-#include <process.h>
-#else
+#include <shlwapi.h>

+#include <io.h>

+#include <process.h>

+#else

 #include <sys/time.h>

+#include <sys/resource.h>

 #include <sys/socket.h>

-#include <arpa/inet.h>
-#include <unistd.h>
-#endif
+#include <arpa/inet.h>

+#include <netdb.h>

+#include <unistd.h>

+#include <errno.h>

+#include <boost/filesystem.hpp>

+#include <boost/thread/thread.hpp>

+#include <boost/algorithm/string.hpp>

+#endif

 

 #pragma hdrstop

 using namespace std;

@@ -88,3 +96,11 @@ using namespace boost;
 #include "market.h"

 #include "uibase.h"

 #include "ui.h"

+

+#include "xpm/addressbook16.xpm"

+#include "xpm/addressbook20.xpm"

+#include "xpm/bitcoin.xpm"

+#include "xpm/check.xpm"

+#include "xpm/send16.xpm"

+#include "xpm/send16noshadow.xpm"

+#include "xpm/send20.xpm"