summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2014-03-20 20:41:46 (GMT)
committerjoye <joye>2014-03-20 20:41:46 (GMT)
commit6f109ea0c83eb24b1b31543041674578b551a552 (patch)
tree4e148539aa4c6afce4e239885896da69e1df5d7f
parent066daa2d382a0ba5b2b904a229529a1581f35f0a (diff)
downloadblt-6f109ea0c83eb24b1b31543041674578b551a552.zip
blt-6f109ea0c83eb24b1b31543041674578b551a552.tar.gz
blt-6f109ea0c83eb24b1b31543041674578b551a552.tar.bz2
*** empty log message ***
-rw-r--r--src/bltGrAxis.C3
-rw-r--r--src/bltGrElemBar.C3
-rw-r--r--src/bltGrElemLine.C3
-rw-r--r--src/bltGrMarker.C3
-rw-r--r--src/bltGrMarkerText.C3
-rw-r--r--src/bltGrPSOutput.C7
-rw-r--r--src/bltGrText.C3
-rw-r--r--src/bltGraph.C3
8 files changed, 19 insertions, 9 deletions
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 5074238..13f3f6c 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -33,9 +33,10 @@
#include <iostream>
using namespace std;
+#include "bltMath.h"
+
extern "C" {
#include "bltInt.h"
-#include "bltMath.h"
#include "bltGraph.h"
#include "bltOp.h"
}
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C
index 4bd366f..3bf2467 100644
--- a/src/bltGrElemBar.C
+++ b/src/bltGrElemBar.C
@@ -30,9 +30,10 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include "bltMath.h"
+
extern "C" {
#include "bltInt.h"
-#include "bltMath.h"
#include "bltGraph.h"
};
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index fece1a4..d9ec49f 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -30,10 +30,11 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include "bltMath.h"
+
extern "C" {
#include "bltInt.h"
#include "bltSpline.h"
-#include "bltMath.h"
#include "bltGraph.h"
}
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index 881df34..e910d5e 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -27,8 +27,9 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-extern "C" {
#include "bltMath.h"
+
+extern "C" {
#include "bltGraph.h"
#include "bltOp.h"
};
diff --git a/src/bltGrMarkerText.C b/src/bltGrMarkerText.C
index d9ff008..6d44328 100644
--- a/src/bltGrMarkerText.C
+++ b/src/bltGrMarkerText.C
@@ -27,9 +27,10 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include "bltMath.h"
+
extern "C" {
#include "bltGraph.h"
-#include "bltMath.h"
};
#include "bltGrMarkerText.h"
diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C
index 949cdbb..bfad8c1 100644
--- a/src/bltGrPSOutput.C
+++ b/src/bltGrPSOutput.C
@@ -28,19 +28,22 @@
*
*/
-extern "C" {
#include <stdarg.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
+extern "C" {
#include <tkPort.h>
#include <tkInt.h>
#include <tk3d.h>
+};
-#include "bltInt.h"
#include "bltMath.h"
+
+extern "C" {
+#include "bltInt.h"
#include "bltPsInt.h"
};
diff --git a/src/bltGrText.C b/src/bltGrText.C
index eec1086..c4235c4 100644
--- a/src/bltGrText.C
+++ b/src/bltGrText.C
@@ -30,13 +30,14 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include "bltMath.h"
+
extern "C" {
#include <tk.h>
#include <tkPort.h>
#include <tkInt.h>
#include "bltInt.h"
-#include "bltMath.h"
#include "bltText.h"
};
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 1841e95..af0d758 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -30,10 +30,11 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include "bltMath.h"
+
extern "C" {
#include "bltInt.h"
#include "bltList.h"
-#include "bltMath.h"
#include "bltGraph.h"
#include "bltOp.h"
}