diff options
| author | Andreas Jaeger <aj@suse.de> | 2012-03-14 16:36:17 +0100 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2012-03-14 16:36:17 +0100 |
| commit | 356a10ee3ee36bec0af7e8a1c61e353e0af45904 (patch) | |
| tree | 421de93f9f53c04d796ccd31102baf135dc55ed8 /socket | |
| parent | a20026128cef2e95ffd15fb293dd6b1e9bf3ae1e (diff) | |
| parent | e456826d7a539fb322bb9719297bd386eded8e32 (diff) | |
| download | glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.tar.gz glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.tar.xz glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.zip | |
Merge branch 'master' into bug13658-branch
Diffstat (limited to 'socket')
| -rw-r--r-- | socket/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/socket/Makefile b/socket/Makefile index b5be39a672..e3a90b8a31 100644 --- a/socket/Makefile +++ b/socket/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991,1995-2001,2005,2008 Free Software Foundation, Inc. +# Copyright (C) 1991,1995-2001,2005,2008,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 @@ -30,6 +30,4 @@ routines := accept bind connect getpeername getsockname getsockopt \ aux := have_sock_cloexec -distribute := ifreq.h - include ../Rules |