Added a check for -lresolv in configure.in
Removed wxFileInputStream::Peek as it is implemented in wxInputStream::Peek git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1794,6 +1794,7 @@ AC_CHECK_FUNCS(uname gethostname, break)
|
|||||||
dnl check for inet_addr, inet_aton, ...
|
dnl check for inet_addr, inet_aton, ...
|
||||||
AC_CHECK_FUNCS(inet_addr)
|
AC_CHECK_FUNCS(inet_addr)
|
||||||
AC_CHECK_FUNCS(inet_aton)
|
AC_CHECK_FUNCS(inet_aton)
|
||||||
|
AC_CHECK_LIB(resolv, inet_aton)
|
||||||
|
|
||||||
dnl ===========================================================================
|
dnl ===========================================================================
|
||||||
dnl Now we have all the info we need - use it!
|
dnl Now we have all the info we need - use it!
|
||||||
|
@@ -32,7 +32,6 @@ class wxFileInputStream: public wxInputStream {
|
|||||||
wxFileInputStream(int fd);
|
wxFileInputStream(int fd);
|
||||||
~wxFileInputStream();
|
~wxFileInputStream();
|
||||||
|
|
||||||
char Peek();
|
|
||||||
size_t GetSize() const;
|
size_t GetSize() const;
|
||||||
|
|
||||||
bool Ok() const { return m_file->IsOpened(); }
|
bool Ok() const { return m_file->IsOpened(); }
|
||||||
|
@@ -62,11 +62,6 @@ wxFileInputStream::~wxFileInputStream()
|
|||||||
delete m_file;
|
delete m_file;
|
||||||
}
|
}
|
||||||
|
|
||||||
char wxFileInputStream::Peek()
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t wxFileInputStream::GetSize() const
|
size_t wxFileInputStream::GetSize() const
|
||||||
{
|
{
|
||||||
return m_file->Length();
|
return m_file->Length();
|
||||||
|
Reference in New Issue
Block a user