diff options
| -rw-r--r-- | src/bltGrElem.h | 1 | ||||
| -rw-r--r-- | src/bltGrElemBar.h | 3 | ||||
| -rw-r--r-- | src/bltGrElemLine.C | 1 | ||||
| -rw-r--r-- | src/bltGrMisc.C | 2 | ||||
| -rw-r--r-- | src/bltGrMisc.h | 8 | ||||
| -rw-r--r-- | src/bltGrPSOutput.C | 1 | ||||
| -rw-r--r-- | src/bltGrPostscriptOp.C | 1 | ||||
| -rw-r--r-- | src/bltGraph.C | 2 | ||||
| -rw-r--r-- | src/bltNsUtil.C | 3 |
9 files changed, 12 insertions, 10 deletions
diff --git a/src/bltGrElem.h b/src/bltGrElem.h index 6cc2eec..b813292 100644 --- a/src/bltGrElem.h +++ b/src/bltGrElem.h @@ -44,7 +44,6 @@ #define SHOW_Y 2 #define SHOW_BOTH 3 -#define MIN(a,b) (((a)<(b))?(a):(b)) #define NUMBEROFPOINTS(e) MIN( (e)->coords.x ? (e)->coords.x->nValues() : 0, \ (e)->coords.y ? (e)->coords.y->nValues() : 0 ) #define NORMALPEN(e) ((((e)->normalPenPtr == NULL) ? \ diff --git a/src/bltGrElemBar.h b/src/bltGrElemBar.h index 38eefa6..9274fb0 100644 --- a/src/bltGrElemBar.h +++ b/src/bltGrElemBar.h @@ -30,8 +30,9 @@ #ifndef __BltGrElemBar_h__ #define __BltGrElemBar_h__ +#include <math.h> + #include <tk.h> -#include <tkInt.h> #include "bltGrElem.h" #include "bltGrPenBar.h" diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index 496b918..88d734c 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -51,7 +51,6 @@ using namespace Blt; #define SEARCH_TRACES 1 // closest point on trace. #define SEARCH_AUTO 2 // traces if linewidth is > 0 and more than one -#define MAX(a,b) (((a)>(b))?(a):(b)) #define MIN3(a,b,c) (((a)<(b))?(((a)<(c))?(a):(c)):(((b)<(c))?(b):(c))) #define PointInRegion(e,x,y) (((x) <= (e)->right) && ((x) >= (e)->left) && ((y) <= (e)->bottom) && ((y) >= (e)->top)) diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C index e6dbfa7..91b9e8d 100644 --- a/src/bltGrMisc.C +++ b/src/bltGrMisc.C @@ -41,8 +41,6 @@ using namespace Blt; -#define MIN(a,b) (((a)<(b))?(a):(b)) - char* Blt::dupstr(const char* str) { char* copy =NULL; diff --git a/src/bltGrMisc.h b/src/bltGrMisc.h index b2d644d..b7c521f 100644 --- a/src/bltGrMisc.h +++ b/src/bltGrMisc.h @@ -37,6 +37,14 @@ using namespace std; #include <tk.h> +#ifndef MIN +# define MIN(x,y) ((x)<(y)?(x):(y)) +#endif + +#ifndef MAX +# define MAX(x,y) ((x)>(y)?(x):(y)) +#endif + #define GRAPH_DELETED (1<<1) #define REDRAW_PENDING (1<<2) #define FOCUS (1<<3) diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C index 46d3ae9..3b0bac9 100644 --- a/src/bltGrPSOutput.C +++ b/src/bltGrPSOutput.C @@ -32,7 +32,6 @@ #include <stdarg.h> #include "tk.h" -#include "tkInt.h" // copied from tk3d.h diff --git a/src/bltGrPostscriptOp.C b/src/bltGrPostscriptOp.C index 91006de..4ff9dbc 100644 --- a/src/bltGrPostscriptOp.C +++ b/src/bltGrPostscriptOp.C @@ -28,7 +28,6 @@ */ #include <tk.h> -#include <tkInt.h> #include "bltGraph.h" #include "bltGrPostscript.h" diff --git a/src/bltGraph.C b/src/bltGraph.C index fc0bc86..3187753 100644 --- a/src/bltGraph.C +++ b/src/bltGraph.C @@ -29,6 +29,8 @@ #include <float.h> +#include <tkInt.h> + #include "bltGraph.h" #include "bltGraphOp.h" diff --git a/src/bltNsUtil.C b/src/bltNsUtil.C index 628d369..bfe4df3 100644 --- a/src/bltNsUtil.C +++ b/src/bltNsUtil.C @@ -27,10 +27,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -extern "C" { -#include <tclPort.h> #include <tclInt.h> -} #include "bltNsUtil.h" |