Revert "Fix declaratons of conditionally defined functions"

I forgot to edit the commit message of this commit to make it comply
with the rules in https://sourceware.org/git/?p=libabigail.git;a=blob;f=COMMIT-LOG-GUIDELINES.

So I am reverting commit cd2af9e5f5f973759ade0595a32694f9e0230647

diff --git a/include/abg-reader.h b/include/abg-reader.h
index f1408912b0be6ee68548df5e1125ce247ce7b45d..70851c86eb87d7dfddaf5b360b760dac06b2e56e 100644 (file)
--- a/include/abg-reader.h
+++ b/include/abg-reader.h
@@ -52,8 +52,7 @@ create_native_xml_read_context(std::istream* in, environment* env);
 const string&
 read_context_get_path(const read_context&);
 
-#ifdef WITH_ZIP_ARCHIVE
-corpus_sptr
+abigail::corpus_sptr
 read_corpus_from_file(const string& path);
 
 int
@@ -62,7 +61,6 @@ read_corpus_from_file(corpus_sptr& corp,
 
 int
 read_corpus_from_file(corpus_sptr& corp);
-#endif //WITH_ZIP_ARCHIVE
 
 corpus_sptr
 read_corpus_from_native_xml(std::istream* in,

diff --git a/tools/abilint.cc b/tools/abilint.cc
index fb7b0781da4aa1f63995f771686503a18419900f..aaf500f7281881035755dc7a1bde8ff398f2b814 100644 (file)
--- a/tools/abilint.cc
+++ b/tools/abilint.cc
@@ -48,6 +48,7 @@ using abigail::corpus;
 using abigail::corpus_sptr;
 using abigail::xml_reader::read_translation_unit_from_file;
 using abigail::xml_reader::read_translation_unit_from_istream;
+using abigail::xml_reader::read_corpus_from_file;
 using abigail::xml_reader::read_corpus_from_native_xml;
 using abigail::xml_reader::read_corpus_from_native_xml_file;
 using abigail::xml_reader::read_corpus_group_from_input;
@@ -57,9 +58,6 @@ using abigail::xml_writer::write_context_sptr;
 using abigail::xml_writer::create_write_context;
 using abigail::xml_writer::write_corpus;
 using abigail::xml_writer::write_corpus_to_archive;
-#ifdef WITH_ZIP_ARCHIVE
-using abigail::xml_reader::read_corpus_from_file;
-#endif
 
 struct options
 {