Mercurial > mplayer.hg

changeset 34195:5affa2074131

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: fix compilation on Solaris due to missing alloca.h #include patch by Granville Moore, gvm nemesys com, fixes Bugzilla #1999
author diego
date Mon, 31 Oct 2011 13:18:45 +0000
parents 280b461a6676
children c910df5dc9ae
files loader/pe_image.c tremor/os.h tremor/tremor.diff
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/loader/pe_image.c	Mon Oct 31 12:25:00 2011 +0000
+++ b/loader/pe_image.c	Mon Oct 31 13:18:45 2011 +0000
@@ -54,6 +54,9 @@
 #else
 #include "osdep/mmap.h"
 #endif
+#ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+#endif
 #include "wine/windef.h"
 #include "wine/winbase.h"
 #include "wine/winerror.h"
--- a/tremor/os.h	Mon Oct 31 12:25:00 2011 +0000
+++ b/tremor/os.h	Mon Oct 31 13:18:45 2011 +0000
@@ -17,6 +17,7 @@
 
  ********************************************************************/
 
+#include "config.h"
 #include <math.h>
 #include "os_types.h"
 
--- a/tremor/tremor.diff	Mon Oct 31 12:25:00 2011 +0000
+++ b/tremor/tremor.diff	Mon Oct 31 13:18:45 2011 +0000
@@ -130,7 +130,8 @@
    int ret=0;
 --- os.h	(revision 25873)
 +++ os.h	(working copy)
-@@ -20,18 +20,8 @@
+@@ -20,2 +20,3 @@
++#include "config.h"
  #include <math.h>
  #include "os_types.h"