RepoMirrors/libabigail
1
0
Fork 0
mirror of git://sourceware.org/git/libabigail.git synced 2024-12-14 22:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix declaratons of conditionally defined functions

Browse Source 
Functions relating to zip archives are declared but are never compiled
when --enable-zip-archive=no, the default.

This makes sure that they are not declared when they won't be defined
due to conditional compilation.

	* include/abg-reader.h (read_corpus_from_file): Guard the
	declaration of these overloads with #ifdef WITH_ZIP_ARCHIVE.
	* tools/abilint.cc: Guard the use of
	abigail::xml_reader::read_corpus_from_file with #ifdef
	WITH_ZIP_ARCHIVE.

Signed-off-by: Ben Woodard <woodard@redhat.com>
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
Ben Woodard via Libabigail 2021-03-02 14:11:12 -08:00 committed by Dodji Seketeli
parent f433d4dbdb
commit 701de3ba5d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/abg-reader.h
View File

@ -52,7 +52,8 @@ create_native_xml_read_context(std::istream* in, environment* env);
const string&
read_context_get_path(const read_context&);
abigail::corpus_sptr
#ifdef WITH_ZIP_ARCHIVE
corpus_sptr
read_corpus_from_file(const string& path);
int
@ -61,6 +62,7 @@ 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,

4
tools/abilint.cc
View File

@ -48,7 +48,6 @@ 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;
@ -58,6 +57,9 @@ 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
{