[MPlayer-cvslog] r34283 - in trunk: loader/pe_image.c tremor/os.h tremor/tremor.diff

[diego]

Author: diego
Date: Mon Oct 31 14:18:45 2011
New Revision: 34283

Log:
build: fix compilation on Solaris due to missing alloca.h #include

patch by Granville Moore, gvm nemesys com, fixes Bugzilla #1999

Modified:
   trunk/loader/pe_image.c
   trunk/tremor/os.h
   trunk/tremor/tremor.diff

Modified: trunk/loader/pe_image.c
==============================================================================
--- trunk/loader/pe_image.c	Mon Oct 31 13:25:00 2011	(r34282)
+++ trunk/loader/pe_image.c	Mon Oct 31 14:18:45 2011	(r34283)
@@ -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"

Modified: trunk/tremor/os.h
==============================================================================
--- trunk/tremor/os.h	Mon Oct 31 13:25:00 2011	(r34282)
+++ trunk/tremor/os.h	Mon Oct 31 14:18:45 2011	(r34283)
@@ -17,6 +17,7 @@
 
  ********************************************************************/
 
+#include "config.h"
 #include <math.h>
 #include "os_types.h"
 

Modified: trunk/tremor/tremor.diff
==============================================================================
--- trunk/tremor/tremor.diff	Mon Oct 31 13:25:00 2011	(r34282)
+++ trunk/tremor/tremor.diff	Mon Oct 31 14:18:45 2011	(r34283)
@@ -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"