[csw-devel] SF.net SVN: gar:[15351] csw/mgar/pkg/ppl/trunk

[dmichelsen at users.sourceforge.net]

Revision: 15351
          http://gar.svn.sourceforge.net/gar/?rev=15351&view=rev
Author:   dmichelsen
Date:     2011-08-16 16:18:26 +0000 (Tue, 16 Aug 2011)

Log Message:
-----------
ppl: Add another patch

Modified Paths:
--------------
    csw/mgar/pkg/ppl/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ppl/trunk/files/0002-Make-call-to-version-explicit-to-avoid-clash-with-ma.patch

Modified: csw/mgar/pkg/ppl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ppl/trunk/Makefile	2011-08-16 16:01:06 UTC (rev 15350)
+++ csw/mgar/pkg/ppl/trunk/Makefile	2011-08-16 16:18:26 UTC (rev 15351)
@@ -30,6 +30,7 @@
 DISTFILES  = $(DISTNAME).tar.gz
 
 PATCHFILES += 0001-R1-is-defined-in-usr-include-ia32-sys-reg.h-disturbi.patch
+PATCHFILES += 0002-Make-call-to-version-explicit-to-avoid-clash-with-ma.patch
 
 VENDOR_URL = http://www.cs.unipr.it/ppl/
 

Added: csw/mgar/pkg/ppl/trunk/files/0002-Make-call-to-version-explicit-to-avoid-clash-with-ma.patch
===================================================================
--- csw/mgar/pkg/ppl/trunk/files/0002-Make-call-to-version-explicit-to-avoid-clash-with-ma.patch	                        (rev 0)
+++ csw/mgar/pkg/ppl/trunk/files/0002-Make-call-to-version-explicit-to-avoid-clash-with-ma.patch	2011-08-16 16:18:26 UTC (rev 15351)
@@ -0,0 +1,26 @@
+From 8386fb5b4d4557eaf78f62409780c4fb6df6e55b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 16 Aug 2011 17:51:24 +0200
+Subject: [PATCH] Make call to version explicit to avoid clash with math.h
+ from gcc
+
+---
+ interfaces/Java/jni/ppl_java_globals.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc
+index 019d02f..c17e439 100644
+--- a/interfaces/Java/jni/ppl_java_globals.cc
++++ b/interfaces/Java/jni/ppl_java_globals.cc
+@@ -735,7 +735,7 @@ Java_parma_1polyhedra_1library_Parma_1Polyhedra_1Library_version_1beta
+ JNIEXPORT jstring JNICALL
+ Java_parma_1polyhedra_1library_Parma_1Polyhedra_1Library_version
+ (JNIEnv* env, jclass) {
+-  return env->NewStringUTF(version());
++  return env->NewStringUTF(Parma_Polyhedra_Library::version());
+ }
+ 
+ JNIEXPORT jstring JNICALL
+-- 
+1.7.6
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.