[gentoo-commits] gentoo-x86 commit in sci-mathematics/octave/files: octave-3.6.4-gcc-4.8.patch

[Justin Lecher (jlec)]

jlec        13/12/07 18:50:41

  Added:                octave-3.6.4-gcc-4.8.patch
  Log:
  sci-mathematics/octave: Get gcc-4.8 fix from debian, #492488, https://savannah.gnu.org/bugs/?38746, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705485
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.1                  sci-mathematics/octave/files/octave-3.6.4-gcc-4.8.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.6.4-gcc-4.8.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.6.4-gcc-4.8.patch?rev=1.1&content-type=text/plain

Index: octave-3.6.4-gcc-4.8.patch
===================================================================
Description: Fix compilation of C++ MEX files with GCC 4.8
 The header mex.h was including mexproto.h within an extern "C" block. In turn,
 mexproto.h includes cstdlib.
 .
 Apparently, including cstdlib within an extern "C" block was working with GCC
 4.7, but this is no longer the case with GCC 4.8.
 .
 The fix consists in including mexproto.h outside of the extern "C" block.
Author: Sébastien Villemot <sebastien@××××××.org>
Bug: https://savannah.gnu.org/bugs/index.php?38746
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705485
Last-Update: 2013-05-29
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/mex.h
+++ b/src/mex.h
@@ -64,6 +64,8 @@
 
 #define mxMAXNAME 64
 
+#include "mexproto.h"
+
 #if defined (__cplusplus)
 extern "C" {
 #endif
@@ -74,8 +76,6 @@
 void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]);
 #endif
 
-#include "mexproto.h"
-
 /* V4 floating point routines renamed in V5.  */
 #define mexIsNaN mxIsNaN
 #define mexIsFinite mxIsFinite