7 files changed, 14 insertions, 14 deletions
diff --git a/src/graph/include/view.h b/src/graph/include/view.h
index 52ecf42b..5d77d46f 100644
--- a/src/graph/include/view.h
+++ b/src/graph/include/view.h
@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* This file is to be included by all the viewport files */
 
 #define check(code)	checker(code,__LINE__,"")
+#undef saymem
 #define saymem(a,b,c)	saymemWithLine(a,b,c,__LINE__)
 #define exitWithAck(ACK,ACKsize,i) \
 		check(write(Socket,&(ACK),sizeof(ACKsize)));  exit(i);
diff --git a/src/graph/view2D/write2d.c b/src/graph/view2D/write2d.c
index 41740132..99dfe667 100644
--- a/src/graph/view2D/write2d.c
+++ b/src/graph/view2D/write2d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include "write.h"
 
 #include "all_2d.H1"
-#include "pixmap.H1"
+#include "pixmap.h"
 #include "Gfun.H1"
 
 
diff --git a/src/graph/view3D/header.h b/src/graph/view3D/header.h
index 1cb58a0d..aa6e27ec 100644
--- a/src/graph/view3D/header.h
+++ b/src/graph/view3D/header.h
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -139,6 +139,8 @@
 #define totalHuesConst  27
 
 #define hueEnd          360
+
+#undef hueStep
 #define hueStep         (hueEnd/totalHuesConst)
 
 #define black           BlackPixel(dsply,scrn)
@@ -146,12 +148,9 @@
 #define numPlanes       1
 #define numColors       10
 #define startColor      0
-#define endColor        (startColor+numColors)
 #define maxColors       (DisplayCells(dsply,scrn)-1)
 #define maxPlanes       (DefaultVisual((dpy),(scr))->bits_per_rgb)
 
-#define colorStep       ((maxColors+1)/numColors)
-
                       /**********************************/
                       /***    Screen and Window Sizes   */
                       /**********************************/
diff --git a/src/graph/view3D/process3d.c b/src/graph/view3D/process3d.c
index 1af50a8b..f8f52bdd 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-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,7 @@
 
 #include "util.H1"
 #include "Gfun.H1"
-#include "pixmap.H1"
+#include "pixmap.h"
 #include "XShade.H1"
 #include "XSpadFill.H1"
 #include "all_3d.H1"
diff --git a/src/graph/view3D/smoothShade3d.c b/src/graph/view3D/smoothShade3d.c
index 81b01bcb..b8896c57 100644
--- a/src/graph/view3D/smoothShade3d.c
+++ b/src/graph/view3D/smoothShade3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 #include "volume.h"
 #include "mode.h"   /* for #define components */
 
-#include "spadcolors.H1"
+#include "spadcolors.h"
 #include "Gfun.H1"
 #include "util.H1"
 #include "XSpadFill.H1"
diff --git a/src/graph/view3D/stuff3d.c b/src/graph/view3D/stuff3d.c
index d68b0785..ed466eb3 100644
--- a/src/graph/view3D/stuff3d.c
+++ b/src/graph/view3D/stuff3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 
 
 #include "Gfun.H1"
-#include "spadcolors.H1"
+#include "spadcolors.h"
 #include "util.H1"
 
 #include "all_3d.H1"
diff --git a/src/graph/view3D/write3d.c b/src/graph/view3D/write3d.c
index caf3aab3..2007293c 100644
--- a/src/graph/view3D/write3d.c
+++ b/src/graph/view3D/write3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
 #include "mode.h"
 
 
-#include "pixmap.H1"
+#include "pixmap.h"
 #include "XShade.H1"
 #include "Gfun.H1"