From eb4642a989aca1aa6c1291a73d43d1247961a234 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Wed, 18 Aug 1999 06:11:07 +0000 Subject: [PATCH] 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 --- configure.in | 1 + include/wx/wfstream.h | 1 - src/common/wfstream.cpp | 5 ----- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/configure.in b/configure.in index d0be0cf..361250b 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 efd9317..1ab4542 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 3bf2a08..f9694ca 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(); -- 2.7.4