Fixed quote format parser compilation.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 5a3bff053ca5c5883802d5dc22806c94aa70ccc5..d71112326a06a4588d82ca8deea4fdaece14a844 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2001-06-06 [sergey]
+
+       * src/quote_fmt.h: renamed from src/quote_fmt_parse.h (which
+       clashes with autogenerated header).
+       * src/compose.c, src/quote_fmt_parse.y: #include "quote_fmt.h"
+       * src/Makefile.am: added quote_fmt.h.
+

 2001-06-06 [paul]
 
         0.4.99claws6
 2001-06-06 [paul]
 
         0.4.99claws6

diff --git a/src/Makefile.am b/src/Makefile.am
index 5e0876495b8b32866d525dbcdb61a348354bbd97..f2079ea1c2161abb5706d09903ac6eca1f0e42fb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,7 +88,7 @@ sylpheed_SOURCES = \
        prefs_filtering.c prefs_filtering.h \
        mbox_folder.c mbox_folder.h \
        quote_fmt_lex.l quote_fmt_lex.h \
        prefs_filtering.c prefs_filtering.h \
        mbox_folder.c mbox_folder.h \
        quote_fmt_lex.l quote_fmt_lex.h \

-       quote_fmt_parse.y
+       quote_fmt_parse.y quote_fmt.h

 
 EXTRA_DIST = \
        pixmaps/clip.xpm \
 
 EXTRA_DIST = \
        pixmaps/clip.xpm \

diff --git a/src/compose.c b/src/compose.c
index a18c2ab095e40ae7efd51e4a29224a0b92ee0a73..bb16a761d96ef5ae330e1b6378f5e0ba355bcd11 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -103,7 +103,7 @@
 #  include "rfc2015.h"
 #endif
 
 #  include "rfc2015.h"
 #endif
 

-#include "quote_fmt_parse.h"
+#include "quote_fmt.h"

 
 typedef enum
 {
 
 typedef enum
 {

diff --git a/src/quote_fmt_parse.h b/src/quote_fmt.h
similarity index 70%
rename from src/quote_fmt_parse.h
rename to src/quote_fmt.h
index 8ac5689aa5919b8586a30355eabb4666cea0a001..a7278e8a1abc047d855e4680f8ef04dea288ce1f 100644 (file)
--- a/src/quote_fmt_parse.h
+++ b/src/quote_fmt.h
@@ -1,6 +1,6 @@
-#ifndef QUOTE_FMT_PARSE_H
+#ifndef QUOTE_FMT_H

 
 

-#define QUOTE_FMT_PARSE_H
+#define QUOTE_FMT_H

 
 gchar * quote_fmt_get_buffer();
 void quote_fmt_init(MsgInfo * info, gchar * my_quote_str);
 
 gchar * quote_fmt_get_buffer();
 void quote_fmt_init(MsgInfo * info, gchar * my_quote_str);

diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 2fff531408fc70df676c07a0cd4bb4adc87534b8..873190e3e3c065b9aae5aabc0721acf58fbeda01 100644 (file)
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -11,6 +11,7 @@
 #include "utils.h"
 #include "intl.h"
 
 #include "utils.h"
 #include "intl.h"
 

+#include "quote_fmt.h"

 #include "quote_fmt_lex.h"
 
 /* decl */
 #include "quote_fmt_lex.h"
 
 /* decl */