0.9.4claws42

* intl/Makefile.in
* src/Makefile.am
* src/matcher.h
* src/common/Makefile.am
* src/common/passcrypt.c
        commit fixes and patches for some of the IRIX problems found by
        Ivan Rayner <ivanr@sgi.com>

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 882396481f620524c7fb5f73c56e7a4453b59866..4a1db5c0127db3be45297afd9e50d372a0e2fb73 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -53,7 +53,7 @@ YFLAGS = --name-prefix=__gettext
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
 -DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
--DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
+-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DINSTALLPREFIX=\"$(prefix)\" -DNO_XMALLOC \
 -Dset_relocation_prefix=libintl_set_relocation_prefix \
 -Drelocate=libintl_relocate \
 -DDEPENDS_ON_LIBICONV=1 @DEFS@

diff --git a/src/Makefile.am b/src/Makefile.am
index 463848b767a6a5873a6cdc7aa1fb53937e7be308..0926c0d8571ba0835265d732ff2d1891086563b9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -329,8 +329,7 @@ EXTRA_DIST = \
 INCLUDES = \
        -Icommon \
        -Igtk \
-       -I$(top_srcdir)/intl \
-       -I$(includedir)
+       -I$(top_srcdir)/intl
 
 sylpheed_LDFLAGS = \
        -export-dynamic

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 41b17354f666fa1cc58e6eac2c64bf2c64eb482d..e66182fba3eac87cc821fde9dd6a1c40926100fa 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -54,6 +54,9 @@ sylpheedcommoninclude_HEADERS = \
        xml.h \
        xmlprops.h
 
+INCLUDES = \
+       -I$(top_srcdir)/intl
+
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(OPENSSL_CFLAGS) \

diff --git a/src/common/passcrypt.c b/src/common/passcrypt.c
index 7481e1a6f73d12de1de3b903962fd065edf9f4b8..3d37cfe1b3b1c9d46ca537e8adda9dbb3c630779 100644 (file)
--- a/src/common/passcrypt.c
+++ b/src/common/passcrypt.c
@@ -30,7 +30,7 @@
 
 #include "passcrypt.h"
 
-void crypt_cfb_buf(const char key[8], void *buf, unsigned len,
+void crypt_cfb_buf(const char key[8], unsigned char *buf, unsigned len,
                   unsigned chunksize, int decrypt);
 static void crypt_cfb_shift(unsigned char *to,
                            const unsigned char *from, unsigned len);
@@ -55,7 +55,7 @@ unsigned char crypt_cfb_iv[64];
 int crypt_cfb_blocksize = 8;   /* 8 for DES */
 
 void
-crypt_cfb_buf(const char key[8], void *buf, unsigned len,
+crypt_cfb_buf(const char key[8], unsigned char *buf, unsigned len,
              unsigned chunksize, int decrypt)
 {
        unsigned char temp[64];
@@ -76,12 +76,10 @@ crypt_cfb_buf(const char key[8], void *buf, unsigned len,
                if (chunksize > len)
                        chunksize = len;
                if (decrypt)
-                       crypt_cfb_shift(crypt_cfb_iv,
-                                       (unsigned char *) buf, chunksize);
+                       crypt_cfb_shift(crypt_cfb_iv, buf, chunksize);
                crypt_cfb_xor((unsigned char *) buf, temp, chunksize);
                if (!decrypt)
-                       crypt_cfb_shift(crypt_cfb_iv,
-                                       (unsigned char *) buf, chunksize);
+                       crypt_cfb_shift(crypt_cfb_iv, buf, chunksize);
                len -= chunksize;
                buf += chunksize;
        }

diff --git a/src/matcher.h b/src/matcher.h
index a145f65fe817d3afad639f140104eaca0387548d..414df2e470b76effd3dfd52463efd061af3db8ab 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -170,5 +170,6 @@ gchar *matching_build_command               (const gchar    *cmd,
 
 void prefs_matcher_read_config         (void);
 void prefs_matcher_write_config                (void);
+void *matcher_parser_scan_string        (gchar          *str);
 
 #endif