diff --git a/configure.in b/configure.in index d0be0cf476..361250ba45 100644 --- a/configure.in +++ b/configure.in @@ -1794,6 +1794,7 @@ AC_CHECK_FUNCS(uname gethostname, break) dnl check for inet_addr, inet_aton, ... AC_CHECK_FUNCS(inet_addr) AC_CHECK_FUNCS(inet_aton) +AC_CHECK_LIB(resolv, inet_aton) dnl =========================================================================== dnl Now we have all the info we need - use it! diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h index efd9317e1f..1ab45426e1 100644 --- a/include/wx/wfstream.h +++ b/include/wx/wfstream.h @@ -32,7 +32,6 @@ class wxFileInputStream: public wxInputStream { wxFileInputStream(int fd); ~wxFileInputStream(); - char Peek(); size_t GetSize() const; bool Ok() const { return m_file->IsOpened(); } diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index 3bf2a080ba..f9694ca306 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -62,11 +62,6 @@ wxFileInputStream::~wxFileInputStream() delete m_file; } -char wxFileInputStream::Peek() -{ - return 0; -} - size_t wxFileInputStream::GetSize() const { return m_file->Length();