about summary refs log tree commit diff
path: root/libio/iogetdelim.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-30 22:34:33 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-30 22:34:33 -0500
commit0eb6f47528cc10645cb0a6919b3af53166ca4fe8 (patch)
treedb61d4a90096b60be41fb33d6d87e79d1d9c3b04 /libio/iogetdelim.c
parent27a25b6e633a3ea071e229337eaae36d0fa243fa (diff)
parentc8a89e7dd5cab24242cc9050387bd5bb902da11a (diff)
downloadglibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.tar.gz
glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.tar.xz
glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	ChangeLog
Diffstat (limited to 'libio/iogetdelim.c')
-rw-r--r--libio/iogetdelim.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libio/iogetdelim.c b/libio/iogetdelim.c
index a362bf978a..3ee7eac873 100644
--- a/libio/iogetdelim.c
+++ b/libio/iogetdelim.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1994,1996-1998,2001,2003,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1994,1996-1998,2001,2003,2005,2012
+   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
@@ -25,9 +26,7 @@
    This exception applies to code released by its copyright holders
    in files containing the exception.  */
 
-#ifdef __STDC__
 #include <stdlib.h>
-#endif
 #include "libioP.h"
 #include <string.h>
 #include <errno.h>