From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 18 May 2014 13:58:22 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v3.2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=209a2a3810abcc345e44a9540937855415c69021;p=thirdparty%2Fccache.git

Merge branch 'maint'

* maint:
  Include signal.h in system.h

Conflicts:
	system.h
---

209a2a3810abcc345e44a9540937855415c69021
diff --cc system.h
index 5309fc5f6,0d796e8b8..0692dcd46
--- a/system.h
+++ b/system.h
@@@ -37,18 -37,16 +37,19 @@@
  #include <errno.h>
  #include <fcntl.h>
  #include <inttypes.h>
 +#include <limits.h>
+ #include <signal.h>
  #include <stdarg.h>
  #include <stddef.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
- #include <unistd.h>
  #include <time.h>
+ #include <unistd.h>
  #include <utime.h>
  
 +extern char **environ;
 +
  #if !HAVE_VSNPRINTF
    int rpl_vsnprintf(char *, size_t, const char *, va_list);
    #define vsnprintf rpl_vsnprintf