Fixed some compilation problems and warnings.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1e79072244137232d1ede05985840b2c7d770851..b80459ef235ea66be5877ef18ceb088c04cd1a57 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,15 @@
+2001-05-12 [sergey]
+
+       * src/matcher.c, src/scoring.c: changed "#ifdef 0" to "#if 0" for
+       some picky compilers.
+       * src/rfc2015.h: provide prototype for rfc2015_disable_all().
+       * src/grouplist_dialog.c: include alertpanel.h.
+       * src/prefs_headers.c (prefs_headers_deleted): added GTK_BUTTON to
+       fix compile warning.
+       * src/scoring.c, src/prefs_folder_item.c, src/matcher.c: brought
+       #include "defs.h" before others to prevent the warning of `MIN'
+       and `MAX' redefinition.
+
 2001-05-11 [hoa]
 
        * src/main.c

diff --git a/src/grouplist_dialog.c b/src/grouplist_dialog.c
index 8bd650aff84ab0dbb9034e7ad3651fc8434d8eea..32931c0691bb4ee8b81498837a5b96315c531caa 100644 (file)
--- a/src/grouplist_dialog.c
+++ b/src/grouplist_dialog.c
@@ -43,6 +43,7 @@
 #include "utils.h"
 #include "news.h"
 #include "folder.h"
+#include "alertpanel.h"
 
 #define GROUPLIST_DIALOG_WIDTH 420
 #define GROUPLIST_DIALOG_HEIGHT        400

diff --git a/src/matcher.c b/src/matcher.c
index 284f291a942012b3faf98edc9683b461375b8cb0..681af1e79d778c4262e14361473c26dbea92d12d 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -2,8 +2,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include "utils.h"
 #include "defs.h"
+#include "utils.h"
 #include "procheader.h"
 #include "matcher.h"
 
@@ -934,7 +934,7 @@ gboolean matcherlist_match(MatcherList * matchers, MsgInfo * info)
        return result;
 }
 
-#ifdef 0
+#if 0
 static void matcherprop_print(MatcherProp * matcher)
 {
   int i;

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 9297b645f948443b550b375f1b873150c059efab..27280f05dede78ba630a1f51694bf432f349ee0e 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -1,8 +1,8 @@
+#include "defs.h"
 #include "folder.h"
 #include "prefs_folder_item.h"
 #include "summaryview.h"
 #include "prefs.h"
-#include "defs.h"
 
 PrefsFolderItem tmp_prefs;
 

diff --git a/src/prefs_headers.c b/src/prefs_headers.c
index 430fc34ae3297b29cf080f4c164c27920cfcf6da..aa4d42f619737db8e63b38d1455a0fb716515939 100644 (file)
--- a/src/prefs_headers.c
+++ b/src/prefs_headers.c
@@ -669,6 +669,6 @@ static void prefs_headers_cancel(GtkButton *button)
 static gint prefs_headers_deleted(GtkWidget *widget, GdkEventAny *event,
                                  gpointer data)
 {
-       prefs_headers_cancel(widget);
+       prefs_headers_cancel(GTK_BUTTON(widget));
        return TRUE;
 }

diff --git a/src/rfc2015.h b/src/rfc2015.h
index 98115b996785f58c214d16785054846c0eff8885..d9ebb9c1214170422a0222582e55a7490891d0c0 100644 (file)
--- a/src/rfc2015.h
+++ b/src/rfc2015.h
@@ -26,6 +26,7 @@
 #include "procmime.h"
 #include "prefs_account.h"
 
+void rfc2015_disable_all (void);
 void rfc2015_secure_remove (const char *fname);
 MimeInfo * rfc2015_find_signature (MimeInfo *mimeinfo);
 gboolean rfc2015_has_signature (MimeInfo *mimeinfo);

diff --git a/src/scoring.c b/src/scoring.c
index b9ad18faf1f18004e1d8de7813f7f5152e0389fe..dd93835989fd930233358ecf1a3d9031a1cc5d3f 100644 (file)
--- a/src/scoring.c
+++ b/src/scoring.c
@@ -3,9 +3,9 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <stdio.h>
+#include "defs.h"
 #include "intl.h"
 #include "utils.h"
-#include "defs.h"
 #include "procheader.h"
 #include "matcher.h"
 #include "scoring.h"
@@ -104,7 +104,7 @@ gint score_message(GSList * scoring_list, MsgInfo * info)
        return score;
 }
 
-#ifdef 0
+#if 0
 static void scoringprop_print(ScoringProp * prop)
 {
        GSList * l;