diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-02-16 14:42:43 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-02-16 14:42:43 +0000 |
| commit | 7548e75065063dae256d94e6c7f4f9f43bd7f210 (patch) | |
| tree | f23b000f8822f6eb70249c1106a3275deaa03bac /lib/xmalloc.c | |
| parent | ddefcddae2e97579f82320f4fd70d0ba14a52392 (diff) | |
| parent | 974ab3dd887985e3aa347f3c6521f819296396a0 (diff) | |
| download | coreutils-7548e75065063dae256d94e6c7f4f9f43bd7f210.tar.gz | |
Merge tag 'upstream/8.21'
Upstream version 8.21
Diffstat (limited to 'lib/xmalloc.c')
| -rw-r--r-- | lib/xmalloc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/xmalloc.c b/lib/xmalloc.c index 3b5f86cd..57e34b7c 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -1,6 +1,6 @@ /* xmalloc.c -- malloc with out of memory checking - Copyright (C) 1990-2000, 2002-2006, 2008-2012 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2002-2006, 2008-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,11 +17,9 @@ #include <config.h> -#if ! HAVE_INLINE -# define static_inline -#endif +#define XALLOC_INLINE _GL_EXTERN_INLINE + #include "xalloc.h" -#undef static_inline #include <stdlib.h> #include <string.h> |