[patch] Fix to make it compile with gcc 4.3.2

mypasswordsafe-20061216-gcc43.patch (text/plain), 1.95 KB, created by Zak Kipling on 2009-01-08 16:19:35 UTC

diff -u mypasswordsafe-0.0.20050615/src/safeserializer.cpp mypasswordsafe-0.0.20050615/src/safeserializer.cpp
--- mypasswordsafe-0.0.20050615/src/safeserializer.cpp
+++ mypasswordsafe-0.0.20050615/src/safeserializer.cpp
@@ -22,6 +22,7 @@
 #include "plaintextlizer.hpp"
 #include "serializers.hpp"
 #include "xmlserializer.hpp"
+#include <algorithm>
 
 using namespace std;
 
--- mypasswordsafe-0.0.20050615.orig/src/crypto/bfproxy.cpp
+++ mypasswordsafe-0.0.20050615/src/crypto/bfproxy.cpp
@@ -17,6 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "bfproxy.hpp"
+#include <cstring>
 
 BFProxy::BFProxy(const unsigned char *key, int len)
 {
only in patch2:
unchanged:
--- mypasswordsafe-0.0.20050615.orig/src/encryptedstring.cpp
+++ mypasswordsafe-0.0.20050615/src/encryptedstring.cpp
@@ -22,6 +22,8 @@
 #include "crypto/sha1.h"
 #include "securedstring.hpp"
 #include "encryptedstring.hpp"
+#include <cstring>
+#include <cstdlib>
 
 using namespace std;
 
only in patch2:
unchanged:
--- mypasswordsafe-0.0.20050615.orig/src/pwsafe/Util.h
+++ mypasswordsafe-0.0.20050615/src/pwsafe/Util.h
@@ -11,6 +11,7 @@
 
 #include <string>
 using std::string;
+#include <cstring>
 #include "PW_sha1.h"
 #include "PwsPlatform.h"
 #include "myutil.hpp"
only in patch2:
unchanged:
--- mypasswordsafe-0.0.20050615.orig/src/pwsafe/Util.cpp
+++ mypasswordsafe-0.0.20050615/src/pwsafe/Util.cpp
@@ -6,6 +6,8 @@
 //#include "PwsPlatform.h"
 
 #include <stdio.h>
+#include <limits.h>
+#include <cstdlib>
 #include <iostream>
 using std::cout;
 using std::endl;
only in patch2:
unchanged:
--- mypasswordsafe-0.0.20050615.orig/src/safe.hpp
+++ mypasswordsafe-0.0.20050615/src/safe.hpp
@@ -128,7 +128,7 @@
   SafeEntry(SafeGroup *parent);
   SafeEntry(SafeGroup *parent,
 	    const QString &n, const QString &u,
-	    const EncryptedString &p, const QString &n);
+	    const EncryptedString &p, const QString &note);
   SafeEntry(const SafeEntry &item);
   ~SafeEntry();