1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25
|
Description: fix ftbfs with GCC-7
change order of includes to fix abs() definition conflict
Author: Slávek Banko <slavek.banko@axis.cz>
Tested-By: Christian T. Steigies <cts@debian.org>
Last-Update: 2017-10-22
Index: b/src/gle/surface/ffitcontour.cpp
===================================================================
--- a/src/gle/surface/ffitcontour.cpp
+++ b/src/gle/surface/ffitcontour.cpp
@@ -43,15 +43,9 @@
/* "f2c.h" defines abs() -- conflict with the definition in <math.h> */
/* changing the order solves the problem */
-#if ( defined(__OS2__) && defined(__EMX__) ) || defined(__WIN32__)
#include <stdio.h>
#include <math.h>
#include "f2c.h"
-#else
-#include "f2c.h"
-#include <stdio.h>
-#include <math.h>
-#endif
doublereal gutre2_(real* a, real* b);
void gd_message__(const char *s, int l);
|