RSSyl: Fix compilation on OS X.
authorAndrej Kacian <ticho@claws-mail.org>
Wed, 27 May 2015 20:58:27 +0000 (22:58 +0200)
committerAndrej Kacian <ticho@claws-mail.org>
Wed, 27 May 2015 20:58:27 +0000 (22:58 +0200)
The enums declared in libfeed's parser*.h files sneaked through
to object built from old_feeds.c file, due to parser.h include.
For some reason, this bothers OS X compiler.
Since these enums were only used in their respective parser*.c file,
I just moved them there.

src/plugins/rssyl/libfeed/parser.c
src/plugins/rssyl/libfeed/parser.h
src/plugins/rssyl/libfeed/parser_atom10.c
src/plugins/rssyl/libfeed/parser_atom10.h
src/plugins/rssyl/libfeed/parser_rdf.c
src/plugins/rssyl/libfeed/parser_rdf.h

index 14f4a36..6439245 100644 (file)
 
 #include "parser.h"
 
+enum {
+       FEED_TYPE_NONE,
+       FEED_TYPE_RDF,
+       FEED_TYPE_RSS_20,
+       FEED_TYPE_ATOM_03,
+       FEED_TYPE_ATOM_10,
+       FEED_TYPE_OPML
+} FeedTypes;
+
 static void _handler_set(XML_Parser parser, guint type)
 {
        if( parser == NULL )
index f8cbb9a..02cd0e5 100644 (file)
@@ -32,14 +32,4 @@ gchar *feed_parser_get_attribute_value(const gchar **attr, const gchar *name);
 int feed_parser_unknown_encoding_handler(void *encdata, const XML_Char *name,
                XML_Encoding *info);
 
-
-enum {
-       FEED_TYPE_NONE,
-       FEED_TYPE_RDF,
-       FEED_TYPE_RSS_20,
-       FEED_TYPE_ATOM_03,
-       FEED_TYPE_ATOM_10,
-       FEED_TYPE_OPML
-} FeedTypes;
-
 #endif /* __PARSER_H */
index 9cf4ffa..8f9f4d6 100644 (file)
 #include "parser.h"
 #include "parser_atom10.h"
 
+enum {
+       FEED_LOC_ATOM10_NONE,
+       FEED_LOC_ATOM10_ENTRY,
+       FEED_LOC_ATOM10_AUTHOR,
+       FEED_LOC_ATOM10_SOURCE,
+       FEED_LOC_ATOM10_CONTENT
+} FeedAtom10Locations;
+
 void feed_parser_atom10_start(void *data, const gchar *el, const gchar **attr)
 {
        FeedParserCtx *ctx = (FeedParserCtx *)data;
index 85e95b4..0b094ab 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __PARSER_ATOM03_H
-#define __PARSER_ATOM03_H
+#ifndef __PARSER_ATOM10_H
+#define __PARSER_ATOM10_H
 
 void feed_parser_atom10_start(void *data, const char *el, const char **attr);
 void feed_parser_atom10_end(void *data, const char *el);
 
-enum {
-       FEED_LOC_ATOM10_NONE,
-       FEED_LOC_ATOM10_ENTRY,
-       FEED_LOC_ATOM10_AUTHOR,
-       FEED_LOC_ATOM10_SOURCE,
-       FEED_LOC_ATOM10_CONTENT
-} FeedAtom10Locations;
-
-#endif /* __PARSER_ATOM03_H */
+#endif /* __PARSER_ATOM10_H */
index d514bf0..77e1df5 100644 (file)
 #include "date.h"
 #include "parser_rdf.h"
 
+enum {
+       FEED_LOC_RDF_NONE,
+       FEED_LOC_RDF_CHANNEL,
+       FEED_LOC_RDF_ITEM
+} FeedRdfLocations;
+
 void feed_parser_rdf_start(void *data, const gchar *el, const gchar **attr)
 {
        FeedParserCtx *ctx = (FeedParserCtx *)data;
index 1c3809f..66299cb 100644 (file)
 void feed_parser_rdf_start(void *data, const char *el, const char **attr);
 void feed_parser_rdf_end(void *data, const char *el);
 
-enum {
-       FEED_LOC_RDF_NONE,
-       FEED_LOC_RDF_CHANNEL,
-       FEED_LOC_RDF_ITEM
-} FeedRdfLocations;
-
 #endif /* __PARSER_RDF_H */