Changeset 15542

Timestamp:

07/22/13 15:09:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplified triangle patch

Location:

issm/trunk-jpl/externalpackages/triangle

Files:

• install-linux64.sh (modified) (2 diffs)
• triangle.c.patch (deleted)
• triangle.h.patch (modified) (1 diff)

issm/trunk-jpl/externalpackages/triangle/install-linux64.sh

@@ -19 +19 @@
 
 #Patch triangle.c 
-patch triangle.c ../triangle.c.patch
+#patch triangle.c ../triangle.c.patch
 
 #Compile triangle
@@ -25 +25 @@
 
 #Patch triangle.h
-patch triangle.h ../triangle.h.patch
+#patch triangle.h ../triangle.h.patch

issm/trunk-jpl/externalpackages/triangle/triangle.h.patch

@@ -1 @@
-249a250,251
-> #ifndef _TRIANGLE_LIBRARY_H_
-> #define _TRIANGLE_LIBRARY_H_
-251c253,259
-< struct triangulateio {
----
-> 
+250a251,257
+> /*Patch for ISSM*/
 > #ifndef REAL
 > typedef double REAL;
 > typedef void VOID;
 > #endif
+> /*End patch*/
 > 
-> extern "C" struct triangulateio {
-283c291
+283c290
 < void triangulate(char *, struct triangulateio *, struct triangulateio *,
 ---
 > extern "C" void triangulate(char *, struct triangulateio *, struct triangulateio *,
-285c293
-< void trifree(VOID *memptr);
----
-> extern "C" void trifree(VOID *memptr);
-289a298,300
-> 
-> 
-> #endif //#ifndef _TRIANGLE_LIBRARY_H_