[FFmpeg-cvslog] Merge commit '0ce3761c781f2c2de40a5a8a99563878804f47cc'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Sep 27 11:54:11 2017 -0300| [407a7547dad5c50d0b82db27be4572edc5e9994d] | committer: James Almer

Merge commit '0ce3761c781f2c2de40a5a8a99563878804f47cc'

* commit '0ce3761c781f2c2de40a5a8a99563878804f47cc':
  configure: Add stdlib.h #include to CPPFLAGS check helper functions

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=407a7547dad5c50d0b82db27be4572edc5e9994d
---

 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index ba38a73906..a8b1f3fea5 100755
--- a/configure
+++ b/configure
@@ -1040,7 +1040,7 @@ check_code(){
 check_cppflags(){
     log check_cppflags "$@"
     check_cpp "$@" <<EOF && append CPPFLAGS "$@"
-int x;
+#include <stdlib.h>
 EOF
 }
 
@@ -1424,7 +1424,7 @@ check_host_cpp(){
 check_host_cppflags(){
     log check_host_cppflags "$@"
     check_host_cpp "$@" <<EOF && append host_cppflags "$@"
-int x;
+#include <stdlib.h>
 EOF
 }
 


======================================================================

diff --cc configure
index ba38a73906,32ab7329e3..a8b1f3fea5
--- a/configure
+++ b/configure
@@@ -1040,7 -872,7 +1040,7 @@@ check_code()
  check_cppflags(){
      log check_cppflags "$@"
      check_cpp "$@" <<EOF && append CPPFLAGS "$@"
- int x;
 -#include <stdlib.h>;
++#include <stdlib.h>
  EOF
  }
  
@@@ -1424,7 -1166,7 +1424,7 @@@ check_host_cpp()
  check_host_cppflags(){
      log check_host_cppflags "$@"
      check_host_cpp "$@" <<EOF && append host_cppflags "$@"
- int x;
 -#include <stdlib.h>;
++#include <stdlib.h>
  EOF
  }