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

diff --git a/configure.in b/configure.in
index d0be0cf4768d31f260e8f5f17bb9c027295bbd1d..361250ba45c4bbc49550d98ad864493adc887ca2 100644 (file)
--- 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 efd9317e1f871dda65786ee7de6e57d96571e095..1ab45426e104bef058238ca9411abff38789c92b 100644 (file)
--- 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 3bf2a080ba94475c276ecf48a4cc75f26b218427..f9694ca3067bdd514d75f8022caeb8bbbe5e9aaa 100644 (file)
--- 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();