From 3ce1f2959437e952b9db4eaeed2407424f11a4d1 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@gmail.com>
Date: Sat, 10 Sep 2011 14:34:15 -0400
Subject: Cleanup of configuration options

Make several tool features mandatory and simplify the code.
---
 hurd/fopenport.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'hurd/fopenport.c')

diff --git a/hurd/fopenport.c b/hurd/fopenport.c
index 5dcb5ab30a..d01b9f3f35 100644
--- a/hurd/fopenport.c
+++ b/hurd/fopenport.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994,95,97,2000,01,02 Free Software Foundation, Inc.
+/* Copyright (C) 1994,1995,1997,2000-2002,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -63,11 +63,7 @@ writeio (void *cookie, const char *buf, size_t n)
    Returns zero if successful, nonzero if not.  */
 static int
 seekio (void *cookie,
-#ifdef USE_IN_LIBIO
 	_IO_off64_t *pos,
-#else
-	fpos_t *pos,
-#endif
 	int whence)
 {
   error_t err = __io_seek ((file_t) cookie, *pos, whence, pos);
@@ -86,12 +82,8 @@ closeio (void *cookie)
   return 0;
 }
 
-#ifdef USE_IN_LIBIO
 #include "../libio/libioP.h"
 #define fopencookie _IO_fopencookie
-#else
-#define cookie_io_functions_t __io_functions
-#endif
 static const cookie_io_functions_t funcsio =
 { readio, writeio, seekio, closeio };
 
-- 
cgit 1.4.1