illumos libc defines __FILE instead of _IO_FILE

1 files changed, 28 insertions, 14 deletions

diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols
index 9674f5b4..1cfebcb7 100644
--- a/debian/libapt-pkg4.12.symbols
+++ b/debian/libapt-pkg4.12.symbols
@@ -73,7 +73,8 @@ libapt-pkg-4.12.so libapt-pkg4.12 #MINVER#
  (c++)"LookupTag(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*, char const*)@Base" 0.8.0
  (c++)"SizeToStr(double)@Base" 0.8.0
  (c++)"StrToTime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, long&)@Base" 0.8.0
- (c++)"TFRewrite(_IO_FILE*, pkgTagSection const&, char const**, TFRewriteData*)@Base" 0.8.0
+ (c++|arch=!illumos-amd64)"TFRewrite(_IO_FILE*, pkgTagSection const&, char const**, TFRewriteData*)@Base" 0.8.0
+ (c++|arch=illumos-amd64)"TFRewrite(__FILE*, pkgTagSection const&, char const**, TFRewriteData*)@Base" 0.9.15+dyson1
  (c++)"TimeToStr(unsigned long)@Base" 0.8.0
  (c++)"_strstrip(char*)@Base" 0.8.0
  (c++)"flCombine(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
@@ -102,7 +103,8 @@ libapt-pkg-4.12.so libapt-pkg4.12 #MINVER#
  (c++)"OpProgress::OpProgress()@Base" 0.8.0
  (c++)"OpProgress::~OpProgress()@Base" 0.8.0
  (c++)"SourceCopy::GetFileName()@Base" 0.8.0
- (c++)"SourceCopy::RewriteEntry(_IO_FILE*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
+ (c++|arch=!illumos-amd64)"SourceCopy::RewriteEntry(_IO_FILE*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
+ (c++|arch=illumos-amd64)"SourceCopy::RewriteEntry(__FILE*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.15+dyson1
  (c++)"SourceCopy::Type()@Base" 0.8.0
  (c++)"SourceCopy::~SourceCopy()@Base" 0.8.0
  (c++)"pkgAcqFile::Custom600Headers()@Base" 0.8.0
@@ -226,7 +228,8 @@ libapt-pkg-4.12.so libapt-pkg4.12 #MINVER#
  (c++)"GlobalError::WarningE(char const*, char const*, ...)@Base" 0.8.0
  (c++)"GlobalError::GlobalError()@Base" 0.8.0
  (c++)"PackageCopy::GetFileName()@Base" 0.8.0
- (c++)"PackageCopy::RewriteEntry(_IO_FILE*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
+ (c++|arch=!illumos-amd64)"PackageCopy::RewriteEntry(_IO_FILE*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
+ (c++|arch=illumos-amd64)"PackageCopy::RewriteEntry(__FILE*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.15+dyson1
  (c++)"PackageCopy::Type()@Base" 0.8.0
  (c++)"PackageCopy::~PackageCopy()@Base" 0.8.0
  (c++)"pkgAcqIndex::Custom600Headers()@Base" 0.8.0
@@ -696,7 +699,8 @@ libapt-pkg-4.12.so libapt-pkg4.12 #MINVER#
  (c++)"debSystem::debSystem()@Base" 0.8.0
  (c++)"debSystem::~debSystem()@Base" 0.8.0
  (c++)"metaIndex::~metaIndex()@Base" 0.8.0
- (c++)"pkgDPkgPM::SendV2Pkgs(_IO_FILE*)@Base" 0.8.0
+ (c++|arch=!illumos-amd64)"pkgDPkgPM::SendV2Pkgs(_IO_FILE*)@Base" 0.8.0
+ (c++|arch=illumos-amd64)"pkgDPkgPM::SendV2Pkgs(__FILE*)@Base" 0.9.15+dyson1
  (c++)"pkgDPkgPM::DoTerminalPty(int)@Base" 0.8.0
  (c++)"pkgDPkgPM::WriteHistoryTag(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
  (c++)"pkgDPkgPM::WriteApportReport(char const*, char const*)@Base" 0.8.0
@@ -1228,19 +1232,26 @@ libapt-pkg-4.12.so libapt-pkg4.12 #MINVER#
  (c++)"edspSystem::FindIndex(pkgCache::PkgFileIterator, pkgIndexFile*&) const@Base" 0.8.16~exp2
  (c++)"edspIndex::Merge(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.16~exp2
  (c++)"edspIndex::GetType() const@Base" 0.8.16~exp2
- (c++)"EDSP::WriteError(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, _IO_FILE*)@Base" 0.8.16~exp2
+ (c++|arch=!illumos-amd64)"EDSP::WriteError(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, _IO_FILE*)@Base" 0.8.16~exp2
+ (c++|arch=illumos-amd64)"EDSP::WriteError(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, __FILE*)@Base" 0.9.15+dyson1
  (c++)"EDSP::ReadRequest(int, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, bool&, bool&, bool&)@Base" 0.8.16~exp2
  (c++)"EDSP::ApplyRequest(std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, pkgDepCache&)@Base" 0.8.16~exp2
  (c++)"EDSP::ReadResponse(int, pkgDepCache&, OpProgress*)@Base" 0.8.16~exp2
  (c++)"EDSP::StringToBool(char const*, bool)@Base" 0.8.16~exp2
- (c++)"EDSP::WriteRequest(pkgDepCache&, _IO_FILE*, bool, bool, bool, OpProgress*)@Base" 0.8.16~exp2
+ (c++|arch=!illumos-amd64)"EDSP::WriteRequest(pkgDepCache&, _IO_FILE*, bool, bool, bool, OpProgress*)@Base" 0.8.16~exp2
+ (c++|arch=illumos-amd64)"EDSP::WriteRequest(pkgDepCache&, __FILE*, bool, bool, bool, OpProgress*)@Base" 0.9.15+dyson1
  (c++)"EDSP::ExecuteSolver(char const*, int*, int*)@Base" 0.8.16~exp2
- (c++)"EDSP::WriteProgress(unsigned short, char const*, _IO_FILE*)@Base" 0.8.16~exp2
- (c++)"EDSP::WriteScenario(pkgDepCache&, _IO_FILE*, OpProgress*)@Base" 0.8.16~exp2
- (c++)"EDSP::WriteSolution(pkgDepCache&, _IO_FILE*)@Base" 0.8.16~exp2
+ (c++|arch=!illumos-amd64)"EDSP::WriteProgress(unsigned short, char const*, _IO_FILE*)@Base" 0.8.16~exp2
+ (c++|arch=illumos-amd64)"EDSP::WriteProgress(unsigned short, char const*, __FILE*)@Base" 0.9.15+dyson1
+ (c++|arch=!illumos-amd64)"EDSP::WriteScenario(pkgDepCache&, _IO_FILE*, OpProgress*)@Base" 0.8.16~exp2
+ (c++|arch=illumos-amd64)"EDSP::WriteScenario(pkgDepCache&, __FILE*, OpProgress*)@Base" 0.9.15+dyson1
+ (c++|arch=!illumos-amd64)"EDSP::WriteSolution(pkgDepCache&, _IO_FILE*)@Base" 0.8.16~exp2
+ (c++|arch=illumos-amd64)"EDSP::WriteSolution(pkgDepCache&, __FILE*)@Base" 0.9.15+dyson1
  (c++)"EDSP::ResolveExternal(char const*, pkgDepCache&, bool, bool, bool, OpProgress*)@Base" 0.8.16~exp2
- (c++)"EDSP::WriteScenarioVersion(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.8.16~exp2
- (c++)"EDSP::WriteScenarioDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.8.16~exp2
+ (c++|arch=!illumos-amd64)"EDSP::WriteScenarioVersion(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.8.16~exp2
+ (c++|arch=illumos-amd64)"EDSP::WriteScenarioVersion(pkgDepCache&, __FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.9.15+dyson1
+ (c++|arch=!illumos-amd64)"EDSP::WriteScenarioDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.8.16~exp2
+ (c++|arch=illumos-amd64)"EDSP::WriteScenarioDependency(pkgDepCache&, __FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.9.15+dyson1
  (c++)"EDSP::DepMap@Base" 0.8.16~exp2
  (c++)"EDSP::PrioMap@Base" 0.8.16~exp2
  (c++)"EDSP::ReadLine(int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.16~exp2
@@ -1419,8 +1430,10 @@ libapt-pkg-4.12.so libapt-pkg4.12 #MINVER#
  (c++)"APT::VersionContainerInterface::getCandidateVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
  (c++)"APT::VersionContainerInterface::getInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
  (c++)"APT::VersionContainerInterface::FromModifierCommandLine(unsigned short&, APT::VersionContainerInterface*, pkgCacheFile&, char const*, std::list<APT::VersionContainerInterface::Modifier, std::allocator<APT::VersionContainerInterface::Modifier> > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
- (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&, OpProgress*)@Base" 0.8.16~exp9
- (c++)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&)@Base" 0.8.16~exp9
+ (c++|arch=!illumos-amd64)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&, OpProgress*)@Base" 0.8.16~exp9
+ (c++|arch=illumos-amd64)"EDSP::WriteLimitedScenario(pkgDepCache&, __FILE*, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&, OpProgress*)@Base" 0.9.15+dyson1
+ (c++|arch=!illumos-amd64)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&)@Base" 0.8.16~exp9
+ (c++|arch=illumos-amd64)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, __FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&)@Base" 0.9.15+dyson1
  (c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
  (c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
  (c++)"typeinfo for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
@@ -1550,7 +1563,8 @@ libapt-pkg-4.12.so libapt-pkg4.12 #MINVER#
  (c++)"operator<<(std::basic_ostream<char, std::char_traits<char> >&, GlobalError::Item)@Base" 0.9.9
  (c++)"pkgDepCache::IsDeleteOkProtectInstallRequests(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1
  (c++)"pkgDepCache::IsInstallOkMultiArchSameVersionSynced(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1
- (c++)"pkgDPkgPM::SendPkgsInfo(_IO_FILE*, unsigned int const&)@Base" 0.9.9.1
+ (c++|arch=!illumos-amd64)"pkgDPkgPM::SendPkgsInfo(_IO_FILE*, unsigned int const&)@Base" 0.9.9.1
+ (c++|arch=illumos-amd64)"pkgDPkgPM::SendPkgsInfo(__FILE*, unsigned int const&)@Base" 0.9.15+dyson1
  (c++)"pkgCache::VerIterator::MultiArchType() const@Base" 0.9.9.1
  (c++)"CommandLine::GetCommand(CommandLine::Dispatch const*, unsigned int, char const* const*)@Base" 0.9.11
  (c++)"CommandLine::MakeArgs(char, char const*, char const*, unsigned long)@Base" 0.9.11