| author | zautrix <zautrix> | 2006-02-24 19:41:06 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2006-02-24 19:41:06 (UTC) |
| commit | 4e2553b95b2787ed7917073f6b628819b1f017c3 (patch) (side-by-side diff) | |
| tree | da5cb746bf3373cb2a368afda082999e6c22751f /pwmanager | |
| parent | 08605356c77351d64e14e0fdd69bdb769f933909 (diff) | |
| download | kdepimpi-4e2553b95b2787ed7917073f6b628819b1f017c3.zip kdepimpi-4e2553b95b2787ed7917073f6b628819b1f017c3.tar.gz kdepimpi-4e2553b95b2787ed7917073f6b628819b1f017c3.tar.bz2 | |
gcc4 fixes
| -rw-r--r-- | pwmanager/libcrypt/cipher/serpent.c | 4 | ||||
| -rw-r--r-- | pwmanager/pwmanager/binentrygen.cpp | 5 | ||||
| -rw-r--r-- | pwmanager/pwmanager/binentrygen.h | 2 | ||||
| -rw-r--r-- | pwmanager/pwmanager/blowfish.cpp | 2 | ||||
| -rw-r--r-- | pwmanager/pwmanager/blowfish.h | 4 | ||||
| -rw-r--r-- | pwmanager/pwmanager/genpasswd.cpp | 1 | ||||
| -rw-r--r-- | pwmanager/pwmanager/libgcryptif.h | 4 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwmexception.h | 3 | ||||
| -rw-r--r-- | pwmanager/pwmanager/randomizer.h | 1 |
9 files changed, 17 insertions, 9 deletions
diff --git a/pwmanager/libcrypt/cipher/serpent.c b/pwmanager/libcrypt/cipher/serpent.c index d606d9f..fb5df20 100644 --- a/pwmanager/libcrypt/cipher/serpent.c +++ b/pwmanager/libcrypt/cipher/serpent.c @@ -675,3 +675,3 @@ serpent_setkey_internal (serpent_context_t *context, } - + static const char *serpent_test (void); /* Initialize CTX with the key KEY of KEY_LENGTH bytes. */ @@ -689,3 +689,3 @@ serpent_setkey (void *ctx, /* Execute a self-test the first time, Serpent is used. */ - static const char *serpent_test (void); + diff --git a/pwmanager/pwmanager/binentrygen.cpp b/pwmanager/pwmanager/binentrygen.cpp index 7d5ae45..f156a5e 100644 --- a/pwmanager/pwmanager/binentrygen.cpp +++ b/pwmanager/pwmanager/binentrygen.cpp @@ -19,7 +19,7 @@ - #include "binentrygen.h" #include "base64.h" -#include "pwmexception.h" +#include "pwmexception.h" +#include "globalstuff.h" @@ -71 +71,2 @@ BinEntryGen::DataType BinEntryGen::binType(const PwMDataItem &data) } + diff --git a/pwmanager/pwmanager/binentrygen.h b/pwmanager/pwmanager/binentrygen.h index a58cd42..49288aa 100644 --- a/pwmanager/pwmanager/binentrygen.h +++ b/pwmanager/pwmanager/binentrygen.h @@ -22,3 +22,2 @@ -#include "pwmdoc.h" @@ -26,2 +25,3 @@ +#include "pwmdoc.h" diff --git a/pwmanager/pwmanager/blowfish.cpp b/pwmanager/pwmanager/blowfish.cpp index 2ca58ce..ee29756 100644 --- a/pwmanager/pwmanager/blowfish.cpp +++ b/pwmanager/pwmanager/blowfish.cpp @@ -45,5 +45,5 @@ -#include "blowfish.h" #include "globalstuff.h" +#include "blowfish.h" diff --git a/pwmanager/pwmanager/blowfish.h b/pwmanager/pwmanager/blowfish.h index 5129eab..862cccb 100644 --- a/pwmanager/pwmanager/blowfish.h +++ b/pwmanager/pwmanager/blowfish.h @@ -25,3 +25,3 @@ -#include "pwmexception.h" +//#include "pwmexception.h" #ifndef _WIN32_ @@ -46,2 +46,4 @@ typedef uint8_t byte; +//#include "pwmexception.h" + /** blowfish encryption algorithm. diff --git a/pwmanager/pwmanager/genpasswd.cpp b/pwmanager/pwmanager/genpasswd.cpp index b0cceff..41078b3 100644 --- a/pwmanager/pwmanager/genpasswd.cpp +++ b/pwmanager/pwmanager/genpasswd.cpp @@ -22,2 +22,3 @@ #include "randomizer.h" +#include "globalstuff.h" diff --git a/pwmanager/pwmanager/libgcryptif.h b/pwmanager/pwmanager/libgcryptif.h index 9a987a2..a08d678 100644 --- a/pwmanager/pwmanager/libgcryptif.h +++ b/pwmanager/pwmanager/libgcryptif.h @@ -26,3 +26,2 @@ -#include "pwmexception.h" @@ -42,2 +41,5 @@ +#include "pwmexception.h" + + /** interface class for the libgcrypt cipher and hash algorithms diff --git a/pwmanager/pwmanager/pwmexception.h b/pwmanager/pwmanager/pwmexception.h index 301ebd7..7f5a3a6 100644 --- a/pwmanager/pwmanager/pwmexception.h +++ b/pwmanager/pwmanager/pwmexception.h @@ -22,3 +22,3 @@ -#include "globalstuff.h" +//#include "globalstuff.h" @@ -216,2 +216,3 @@ void __printError(const string &msg); +#include "globalstuff.h" #endif // __PWMEXCEPTION_H diff --git a/pwmanager/pwmanager/randomizer.h b/pwmanager/pwmanager/randomizer.h index f2a6015..44cc28e 100644 --- a/pwmanager/pwmanager/randomizer.h +++ b/pwmanager/pwmanager/randomizer.h @@ -23,2 +23,3 @@ #include "pwmexception.h" +#include "globalstuff.h" |