Changeset 28020

Timestamp:

11/17/23 21:12:03 (16 months ago)

Author:

jdquinn

Message:

BUG: Need to include extern “C” still

File:

• issm/trunk-jpl/externalpackages/triangle/configs/triangle.h.patch (modified) (4 diffs)

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

@@ -52 +52 @@
  /*                                                                           */
  /*  Any input fields that Triangle will examine must be initialized.         */
-@@ -247,17 +247,29 @@
+@@ -247,17 +247,23 @@
  /*  not used, `numberofsegments' will indicate the number of boundary edges. */
  /*                                                                           */
  /*****************************************************************************/
 +
-+#pragma once
-+
-+#ifndef ANSI_DECLARATORS
-+#define ANSI_DECLARATORS
-+#endif // ANSI_DECLARATORS
- 
 +#ifdef SINGLE
 +#define TRI_REAL float
@@ -68 +62 @@
 +#define TRI_REAL double
 +#endif /* not SINGLE */
-+
+ 
  struct triangulateio {
 -  REAL *pointlist;                                               /* In / out */
@@ -86 +80 @@
    int numberoftriangles;                                         /* In / out */
    int numberofcorners;                                           /* In / out */
-@@ -267,22 +279,22 @@
+@@ -267,22 +273,22 @@
    int *segmentmarkerlist;                                        /* In / out */
    int numberofsegments;                                          /* In / out */
@@ -106 +100 @@
  
  #ifdef ANSI_DECLARATORS
- void triangulate(char *, struct triangulateio *, struct triangulateio *,
+-void triangulate(char *, struct triangulateio *, struct triangulateio *,
++extern "C" void triangulate(char *, struct triangulateio *, struct triangulateio *,
                   struct triangulateio *);
 -void trifree(VOID *memptr);