[backfire] merge r32648 and r32649 (#12005)

[10.03/openwrt.git] / target / linux / generic-2.6 / patches-2.6.30 / 902-darwin_scripts_include.patch

diff --git a/target/linux/generic-2.6/patches-2.6.30/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.30/902-darwin_scripts_include.patch
index c5aadd1..4ff1536 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/902-darwin_scripts_include.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/902-darwin_scripts_include.patch
@@ -92,7 +92,7 @@
  #include <sys/mman.h>
  #include <fcntl.h>
  #include <unistd.h>
-+#ifndef __APPLE__
++#if !(defined(__APPLE__) || defined(__CYGWIN__))
  #include <elf.h>
 +#else
 +#include "../../../../../tools/sstrip/include/elf.h"