* graph/view2D/process2d.c: Include "cfuns.h? before other local

	headers. 
	* graph/view2D/control2d.c: Likewise.
	* graph/view2D/main2d.c: Likewise.
	* graph/view3D/process3d.c: Likewise.
	* graph/view3D/main3d.c: Likewise.
	* graph/view3D/surface3d.c: Likewise.

7 files changed, 22 insertions, 17 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8546c455..39ae2ffd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,15 @@
 2011-07-04  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* graph/view2D/process2d.c: Include "cfuns.h? before other local
+	headers. 
+	* graph/view2D/control2d.c: Likewise.
+	* graph/view2D/main2d.c: Likewise.
+	* graph/view3D/process3d.c: Likewise.
+	* graph/view3D/main3d.c: Likewise.
+	* graph/view3D/surface3d.c: Likewise.
+
+2011-07-04  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* interp/setvars.boot: Remove support for script formula.
 	* interp/setvart.boot: Likewise.
 	* interp/diagnostics.boot (sayBrightlyNT1): Move from macros.lisp.
diff --git a/src/graph/view2D/control2d.c b/src/graph/view2D/control2d.c
index b3031697..191a0619 100644
--- a/src/graph/view2D/control2d.c
+++ b/src/graph/view2D/control2d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  Copyright (C) 2007-2011, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -44,13 +44,13 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
+#include "cfuns.h"
 #include "header2.h"
 #include "buttons2d.H1"
 #include "all_2d.H1"
 #include "Gfun.H1"
 #include "XSpadFill.h"
 #include "util.H1"
-#include "cfuns.h"
 
 
 #include "mouse11.bitmap"
diff --git a/src/graph/view2D/main2d.c b/src/graph/view2D/main2d.c
index 5642c7ae..1c176729 100644
--- a/src/graph/view2D/main2d.c
+++ b/src/graph/view2D/main2d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  Copyright (C) 2007-2011, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@
 #include <unistd.h>
 #include <signal.h>
 
+#include "cfuns.h"
 #include "header2.h"
 #include "bsdsignal.h"
 #include "globals2.h"
@@ -49,7 +50,6 @@
 #include "Gfun.H1"
 #include "util.H1"
 #include "XSpadFill.h"
-#include "cfuns.h"
 
 using namespace OpenAxiom;
 
diff --git a/src/graph/view2D/process2d.c b/src/graph/view2D/process2d.c
index 803a2822..276948ef 100644
--- a/src/graph/view2D/process2d.c
+++ b/src/graph/view2D/process2d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  Copyright (C) 2007-2011, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -46,13 +46,12 @@
 #include <sys/select.h>
 #endif
 
+#include "cfuns.h"
 #include "header2.h"
-
 #include "all_2d.H1"
 #include "util.H1"
 #include "Gfun.H1"
 #include "XSpadFill.h"
-#include "cfuns.h"
 
 using namespace OpenAxiom;
 
diff --git a/src/graph/view3D/main3d.c b/src/graph/view3D/main3d.c
index b00d2b87..d04b7724 100644
--- a/src/graph/view3D/main3d.c
+++ b/src/graph/view3D/main3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  Copyright (C) 2007-2011, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -42,17 +42,16 @@
 #include <unistd.h>
 #include <signal.h>
 
+#include "cfuns.h"
 #include "header.h"
 #include "cpanel.h"
 #include "process.h"
 #include "bsdsignal.h"
-
 #include "util.H1"
 #include "Gfun.H1"
 #include "XSpadFill.h"
 #include "XShade.h"
 #include "all_3d.H1"
-#include "cfuns.h"
 
 using namespace OpenAxiom;
 
diff --git a/src/graph/view3D/process3d.c b/src/graph/view3D/process3d.c
index dc8540b0..77eb8782 100644
--- a/src/graph/view3D/process3d.c
+++ b/src/graph/view3D/process3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  Copyright (C) 2007-2011, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@
 #include <sys/time.h>
 
 
+#include "cfuns.h"
 #include "header.h"
 #include "cpanel.h"
 #include "volume.h"
@@ -52,15 +53,12 @@
 #include "draw.h"
 #include "sockio.h"
 #include "com.h"
-
-
 #include "util.H1"
 #include "Gfun.H1"
 #include "pixmap.h"
 #include "XShade.h"
 #include "XSpadFill.h"
 #include "all_3d.H1"
-#include "cfuns.h"
 
 #define inside(A,B) (((XButtonEvent *)event)->x >= A && \
                      ((XButtonEvent *)event)->x <= B)
diff --git a/src/graph/view3D/surface3d.c b/src/graph/view3D/surface3d.c
index b7a19cc5..3cff2df6 100644
--- a/src/graph/view3D/surface3d.c
+++ b/src/graph/view3D/surface3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  Copyright (C) 2007-2011, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -40,12 +40,11 @@
 #include <math.h>
 #include <stdlib.h>
 
+#include "sockio.h"
 #include "header.h"
 #include "draw.h"
 #include "mode.h"   /* for #define components */
-#include "sockio.h"
 #include "com.h"
-
 #include "XSpadFill.h"
 #include "XShade.h"
 #include "util.H1"