File GMT4.5.9include.patch of Package GMT

Overview Repositories Revisions Requests Users Attributes Meta

File GMT4.5.9include.patch of Package GMT (Revision aa790c24ee4e91300a9714f68ed660ae)

Currently displaying revision aa790c24ee4e91300a9714f68ed660ae , Show latest

diff -ur GMT4.5.9/doc/examples/functions.sh GMT4.5.9_fix/doc/examples/functions.sh
--- GMT4.5.9/doc/examples/functions.sh	2011-08-17 23:58:32.000000000 +0200
+++ GMT4.5.9_fix/doc/examples/functions.sh	2013-03-04 16:18:30.352203233 +0100
@@ -1,3 +1,4 @@
+#!/bin/sh
 # Bash script inclusion to test all GMT examples.
 # It sets the environment such that the examples are created as in the manual.
 
diff -ur GMT4.5.9/src/gmt_io.c GMT4.5.9_fix/src/gmt_io.c
--- GMT4.5.9/src/gmt_io.c	2012-12-18 21:45:55.000000000 +0100
+++ GMT4.5.9_fix/src/gmt_io.c	2013-03-04 16:13:49.202043386 +0100
@@ -79,6 +79,7 @@
  * Now 64-bit enabled.
  */
 
+#define _XOPEN_SOURCE
 #define GMT_WITH_NO_PS
 #include "gmt.h"
 
diff -ur GMT4.5.9/src/gmtmath.c GMT4.5.9_fix/src/gmtmath.c
--- GMT4.5.9/src/gmtmath.c	2012-12-18 21:45:55.000000000 +0100
+++ GMT4.5.9_fix/src/gmtmath.c	2013-03-04 16:31:05.169342006 +0100
@@ -60,6 +60,7 @@
  *		08-OCT-2008 RS: Added INRANGE (which was added to grdmath on 28-MAR-2004, but not to gmtmath)
  */
 
+#define _XOPEN_SOURCE
 #include "gmt.h"
 
 #define GMTMATH_ARG_IS_OPERATOR	 0
diff -ur GMT4.5.9/src/gmtmath.h GMT4.5.9_fix/src/gmtmath.h
--- GMT4.5.9/src/gmtmath.h	2013-01-02 17:04:57.000000000 +0100
+++ GMT4.5.9_fix/src/gmtmath.h	2013-03-04 16:23:59.125848126 +0100
@@ -20,6 +20,8 @@
  *	Do NOT edit manually!
  */
 
+#include <math.h>
+
 void gmtmath_init (PFV ops[], GMT_LONG n_args[], GMT_LONG n_out[])
 {
 
diff -ur GMT4.5.9/src/grdmath.c GMT4.5.9_fix/src/grdmath.c
--- GMT4.5.9/src/grdmath.c	2012-12-18 21:45:55.000000000 +0100
+++ GMT4.5.9_fix/src/grdmath.c	2013-03-04 16:30:55.744640654 +0100
@@ -48,6 +48,7 @@
  *
  */
 
+#define _XOPEN_SOURCE
 #include "gmt.h"
 
 #define GRDMATH_ARG_IS_OPERATOR		 0
diff -ur GMT4.5.9/src/meca/utilmeca.c GMT4.5.9_fix/src/meca/utilmeca.c
--- GMT4.5.9/src/meca/utilmeca.c	2012-12-18 21:45:56.000000000 +0100
+++ GMT4.5.9_fix/src/meca/utilmeca.c	2013-03-04 16:28:43.068845447 +0100
@@ -9,6 +9,10 @@
 #include "meca.h"
 #include "nrutil.h"
 
+double null_axis_dip(double str1,double dip1,double str2,double dip2);
+double null_axis_strike(double str1,double dip1,double str2,double dip2);
+double proj_radius(double str1,double dip1,double str);
+
 /************************************************************************/
 void get_trans (double slon,double slat,double *t11,double *t12,double *t21,double *t22)
 
@@ -65,11 +69,6 @@
 /* Genevieve Patau */
 
 {
-
-	double null_axis_dip();
-	double null_axis_strike();
-	double proj_radius();
-
 	double x[1000], y[1000];
 	double pos_NP1_NP2 = sind(meca.NP1.str - meca.NP2.str);
 	double fault = (GMT_IS_ZERO (meca.NP1.rake) ? meca.NP2.rake / fabs(meca.NP2.rake) : meca.NP1.rake / fabs(meca.NP1.rake));
@@ -293,8 +292,6 @@
 	GMT_LONG i;
 	GMT_LONG npoints;
 
-	double proj_radius();
-
 	double x[1000], y[1000];
 	double radius_size;
 	double str, radius, increment;
@@ -354,8 +351,6 @@
 	GMT_LONG i;
 	GMT_LONG npoints, lineout=1;
 
-	double proj_radius();
-
 	double x[1000], y[1000];
 	double radius_size;
 	double str, radius, increment;
@@ -528,9 +523,6 @@
 /* Genevieve Patau */
 
 {
-	double computed_strike1();
-	double computed_dip1();
-
 	double rake2, sinrake2;
 	double str2 = computed_strike1(NP1);
 	double dip2 = computed_dip1(NP1);
diff -ur GMT4.5.9/src/mgg/gmt_mgg.c GMT4.5.9_fix/src/mgg/gmt_mgg.c
--- GMT4.5.9/src/mgg/gmt_mgg.c	2012-12-18 21:45:56.000000000 +0100
+++ GMT4.5.9_fix/src/mgg/gmt_mgg.c	2013-03-04 16:38:03.875079613 +0100
@@ -162,7 +162,7 @@
  * the gmtfile directories.
  */
 
-void gmtmggpath_init () {
+void gmtmggpath_init (void) {
 	char file[BUFSIZ], line[BUFSIZ];
 	FILE *fp = NULL;
 
diff -ur GMT4.5.9/src/mgg/gmt_mgg.h GMT4.5.9_fix/src/mgg/gmt_mgg.h
--- GMT4.5.9/src/mgg/gmt_mgg.h	2012-12-18 21:45:56.000000000 +0100
+++ GMT4.5.9_fix/src/mgg/gmt_mgg.h	2013-03-04 16:33:22.763982573 +0100
@@ -28,7 +28,7 @@
 EXTERN_MSC int gmtmgg_date (int time, int *year, int *month, int *day, int *hour, int *minute, int *second, struct GMTMGG_TIME *gmt_struct);
 EXTERN_MSC struct GMTMGG_TIME *gmtmgg_init (int year1);
 EXTERN_MSC int gmtmgg_time (int *time, int year, int month, int day, int hour, int minute, int second, struct GMTMGG_TIME *gmt_struct);
-EXTERN_MSC void gmtmggpath_init ();
+EXTERN_MSC void gmtmggpath_init (void);
 EXTERN_MSC int gmtmggpath_func (char *leg_path, char *leg);
 EXTERN_MSC int gmtmgg_decode_MGD77 (char *string, int tflag, struct GMTMGG_REC *record, struct GMTMGG_TIME **gmt_struct, int anom_offset);
-EXTERN_MSC void gmtmgg_end ();
+EXTERN_MSC void gmtmgg_end (void);
diff -ur GMT4.5.9/src/misc/gmtdigitize.c GMT4.5.9_fix/src/misc/gmtdigitize.c
--- GMT4.5.9/src/misc/gmtdigitize.c	2012-12-18 21:45:55.000000000 +0100
+++ GMT4.5.9_fix/src/misc/gmtdigitize.c	2013-03-04 16:07:57.764098191 +0100
@@ -37,6 +37,11 @@
  *
  */
  
+#define _XOPEN_SOURCE
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include "gmt.h"
 
 #ifndef WIN32
diff -ur GMT4.5.9/src/x2sys/x2sys.c GMT4.5.9_fix/src/x2sys/x2sys.c
--- GMT4.5.9/src/x2sys/x2sys.c	2012-12-18 21:45:54.000000000 +0100
+++ GMT4.5.9_fix/src/x2sys/x2sys.c	2013-03-04 16:42:06.363401057 +0100
@@ -594,7 +594,7 @@
 	else {
 		char name[80];
 		if (!(s->flags & 1)) {	/* Must init gmt file paths */
-			gmtmggpath_init (GMT_SHAREDIR);
+			gmtmggpath_init ();
 			s->flags |= 1;
 		}
 		strncpy (name, fname, (size_t)80);
diff -ur GMT4.5.9/src/x_system/x_over.c GMT4.5.9_fix/src/x_system/x_over.c
--- GMT4.5.9/src/x_system/x_over.c	2011-08-17 23:58:25.000000000 +0200
+++ GMT4.5.9_fix/src/x_system/x_over.c	2013-03-04 16:10:41.894934643 +0100
@@ -586,7 +586,7 @@
     delx[leg] = (double)lon[pt[leg]+1] - (double)lon[pt[leg]];
     dely[leg] = (double)lat[pt[leg]+1] - (double)lat[pt[leg]];
     delt[leg] = (double)ttime[pt[leg]+1] - (double)ttime[pt[leg]];
-    grad[leg] = (delx[leg] == 0.0) ? grad[leg] = MAX_DOUBLE : dely[leg]/delx[leg];
+    grad[leg] = (delx[leg] == 0.0) ? MAX_DOUBLE : dely[leg]/delx[leg];
   }
   /* grad = MAX_DOUBLE means that line due N-S */
   if (delt[0] > maxgap || delt[1] > maxgap) return (FALSE);	/* Data gap */

Places

File GMT4.5.9include.patch of Package GMT (Revision aa790c24ee4e91300a9714f68ed660ae)

Places