0.9.4claws42
authorChristoph Hohmann <reboot@gmx.ch>
Fri, 29 Aug 2003 12:56:55 +0000 (12:56 +0000)
committerChristoph Hohmann <reboot@gmx.ch>
Fri, 29 Aug 2003 12:56:55 +0000 (12:56 +0000)
* 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>

intl/Makefile.in
src/Makefile.am
src/common/Makefile.am
src/common/passcrypt.c
src/matcher.h

index 8823964..4a1db5c 100644 (file)
@@ -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@
index 463848b..0926c0d 100644 (file)
@@ -329,8 +329,7 @@ EXTRA_DIST = \
 INCLUDES = \
        -Icommon \
        -Igtk \
-       -I$(top_srcdir)/intl \
-       -I$(includedir)
+       -I$(top_srcdir)/intl
 
 sylpheed_LDFLAGS = \
        -export-dynamic
index 41b1735..e66182f 100644 (file)
@@ -54,6 +54,9 @@ sylpheedcommoninclude_HEADERS = \
        xml.h \
        xmlprops.h
 
+INCLUDES = \
+       -I$(top_srcdir)/intl
+
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(OPENSSL_CFLAGS) \
index 7481e1a..3d37cfe 100644 (file)
@@ -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;
        }
index a145f65..414df2e 100644 (file)
@@ -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