From 75a9a710fde18f62be1e22c4b698e1b5bc03e29e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 21 Aug 2010 15:54:48 +0000 Subject: [PATCH] Fixing the gnumake log.patch so it applies to the new gnumake svn path=/nixpkgs/branches/stdenv-updates/; revision=23308 --- pkgs/development/tools/build-managers/gnumake/log.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gnumake/log.patch b/pkgs/development/tools/build-managers/gnumake/log.patch index 0f3ed6d7299..ca0d6340790 100644 --- a/pkgs/development/tools/build-managers/gnumake/log.patch +++ b/pkgs/development/tools/build-managers/gnumake/log.patch @@ -93,9 +93,9 @@ diff -rc make-3.81-orig/make.h make-3.81/make.h *************** *** 609,611 **** --- 609,614 ---- - #define ENULLLOOP(_v,_c) do{ errno = 0; \ - while (((_v)=_c)==0 && errno==EINTR); }while(0) + #define ENULLLOOP(_v,_c) do { errno = 0; (_v) = _c; } \ + while((_v)==0 && errno==EINTR) + extern int enable_nested_output; + extern int stdout_nesting_level; + extern int stderr_nesting_level;