[svn] Renamed xread/xwrite/xclose to fd_read/fd_write/fd_close. The "x" prefix is

[wget] / src / rbuf.h

diff --git a/src/rbuf.h b/src/rbuf.h
index 88497d49b8b534cfa34278a0b07cf8408f2e1c54..b042637728c80b306997db59f26115e0ac5de9ce 100644 (file)
--- a/src/rbuf.h
+++ b/src/rbuf.h
@@ -15,22 +15,25 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  */
 
 #ifndef RBUF_H
 #define RBUF_H
 
-#ifdef HAVE_SSL
-# include <openssl/ssl.h>
-#endif
-
 /* Retrieval stream */
 struct rbuf
 {
   int fd;
-#ifdef HAVE_SSL
-  SSL *ssl;            /* the ssl structure -- replaces fd for ssl connections */
-#endif /* HAVE_SSL */
   char buffer[4096];           /* the input buffer */
   char *buffer_pos;            /* current position in the buffer */
   size_t buffer_left;          /* number of bytes left in the buffer:
@@ -65,9 +68,6 @@ struct rbuf
 /* Return the file descriptor of RBUF.  */
 #define RBUF_FD(rbuf) ((rbuf)->fd)
 
-/* Return the file descriptor of RBUF.  */
-#define RBUF_SSL(rbuf) ((rbuf)->ssl)
-
 /* Function declarations */
 void rbuf_initialize PARAMS ((struct rbuf *, int));
 int rbuf_initialized_p PARAMS ((struct rbuf *));