diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-30 22:34:33 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-30 22:34:33 -0500 |
| commit | 0eb6f47528cc10645cb0a6919b3af53166ca4fe8 (patch) | |
| tree | db61d4a90096b60be41fb33d6d87e79d1d9c3b04 /libio/filedoalloc.c | |
| parent | 27a25b6e633a3ea071e229337eaae36d0fa243fa (diff) | |
| parent | c8a89e7dd5cab24242cc9050387bd5bb902da11a (diff) | |
| download | glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.tar.xz glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'libio/filedoalloc.c')
| -rw-r--r-- | libio/filedoalloc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libio/filedoalloc.c b/libio/filedoalloc.c index 4f62dcd910..6cbe2e2422 100644 --- a/libio/filedoalloc.c +++ b/libio/filedoalloc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997, 2001, 2002, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997, 2001-2002, 2011-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 @@ -62,10 +62,8 @@ #include "libioP.h" #include <sys/types.h> #include <sys/stat.h> -#ifdef __STDC__ #include <stdlib.h> #include <unistd.h> -#endif #ifdef _LIBC # undef isatty |