From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 2 Mar 2013 19:33:34 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v3.2~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4c0499f2ff5585a0e1d8edf91f240471e25acf4;p=thirdparty%2Fccache.git

Merge branch 'maint'

* maint:
  Improve execute() not to rely on special exit codes internally

Conflicts:
	execute.c
---

f4c0499f2ff5585a0e1d8edf91f240471e25acf4
diff --cc execute.c
index 7ecb1f23c,7c5e8b5d8..2d295d403
--- a/execute.c
+++ b/execute.c
@@@ -19,12 -19,6 +19,8 @@@
  
  #include "ccache.h"
  
- /* Let's hope no compiler uses these exit statuses. */
- #define FAILED_TO_CREATE_STDOUT 212
- #define FAILED_TO_CREATE_STDERR 213
- 
 +extern struct conf *conf;
 +
  static char *
  find_executable_in_path(const char *name, const char *exclude_name, char *path);