4 files changed, 14 insertions, 13 deletions
diff --git a/src/graph/view2D/control2d.c b/src/graph/view2D/control2d.c
index ea79102d..051184c4 100644
--- a/src/graph/view2D/control2d.c
+++ b/src/graph/view2D/control2d.c
@@ -450,9 +450,11 @@ makeControlPanel(void)
   cXY = getControlXY(0);
 
   /* Define and assign a mouse cursor. */
-  mousebits = XCreateBitmapFromData(dsply,rtWindow,mouseBitmap_bits,
+  mousebits = XCreateBitmapFromData(dsply,rtWindow,
+                                    (const char*) mouseBitmap_bits,
                                     mouseBitmap_width,mouseBitmap_height);
-  mousemask = XCreateBitmapFromData(dsply,rtWindow,mouseMask_bits,
+  mousemask = XCreateBitmapFromData(dsply,rtWindow,
+                                    (const char*) mouseMask_bits,
                                     mouseMask_width,mouseMask_height);
   cwAttrib.background_pixel = backgroundColor; /* controlBackground; */
   cwAttrib.border_pixel = foregroundColor;
diff --git a/src/graph/view2D/main2d.c b/src/graph/view2D/main2d.c
index 9cd10c6e..29c3b3d7 100644
--- a/src/graph/view2D/main2d.c
+++ b/src/graph/view2D/main2d.c
@@ -156,7 +156,7 @@ main(void)
 {
 
   XGCValues       controlGCVals;
-  int             i,code;
+  int             i;
   view2DStruct    viewData;
   
   char property[256];
@@ -418,7 +418,7 @@ main(void)
   /**** Get Data from the Viewport Manager ****/
   
   i = 123;
-  code=check(write(Socket,&i,intSize));
+  check(write(Socket,&i,intSize));
   
   /* Check if I am getting stuff from OpenAxiom or, if I am viewAlone. */
   readViewman(&viewAloned,intSize);
@@ -464,7 +464,7 @@ mergeDatabases(void)
   XrmDatabase homeDB,serverDB,applicationDB;
   char filenamebuf[1024];
   char *filename = &filenamebuf[0];
-  char *classname = "OpenAxiom";
+  const char *classname = "OpenAxiom";
   char name[255];
   
   (void) XrmInitialize();
diff --git a/src/graph/view2D/viewport2D.c b/src/graph/view2D/viewport2D.c
index 50e571db..2a09856e 100644
--- a/src/graph/view2D/viewport2D.c
+++ b/src/graph/view2D/viewport2D.c
@@ -107,7 +107,7 @@ drawTheViewport(int dFlag)
   Vertex            *anX10Point;
   float             jj,diffX, diffY, tickStart,oneTickUnit;
   int               i,j,k,ii,halfSize;
-  int               charlength,strlength,halflength,halfheight;
+  int               charlength,strlength,halflength;
   int               ptX,ptY,ptX1,ptY1,clipped, clipped1;
   int               xAxis,yAxis,dummyInt, ascent, descent;
   int               unitWidth,boxX,boxY,boxW,boxH;
@@ -120,7 +120,6 @@ drawTheViewport(int dFlag)
   aspectR = (float)vwInfo.width/(float)vwInfo.height;
 
   XTextExtents(unitFont,"o",1,&dummyInt,&ascent,&descent,&overall);
-  halfheight = (ascent + descent) / 2;
 
   /* Calculate various factors for use in projection. */
   /* Scale the plot, so that the scaling between the axes remains 
@@ -594,10 +593,10 @@ makeViewport(const char* title,int vX,int vY,int vW,int vH,int showCP)
 
   /**** Make the windows for the viewport ****/
   spadbits = XCreateBitmapFromData(dsply,rtWindow,
-                                   spadBitmap_bits,
+                                   (const char*) spadBitmap_bits,
                                    spadBitmap_width,spadBitmap_height);
   spadmask = XCreateBitmapFromData(dsply,rtWindow,
-                                   spadMask_bits,
+                                   (const char*) spadMask_bits,
                                    spadMask_width,spadMask_height);
   viewAttrib.background_pixel = backgroundColor;
   viewAttrib.border_pixel = foregroundColor;
diff --git a/src/graph/view2D/write2d.c b/src/graph/view2D/write2d.c
index 99dfe667..4431da08 100644
--- a/src/graph/view2D/write2d.c
+++ b/src/graph/view2D/write2d.c
@@ -56,7 +56,7 @@ writeViewport(int thingsToWrite)
   FILE              *viewDataFile;
   char              viewDirName[80],
                     viewBitmapFilename[80],viewDataFilename[80],command[80];
-  int               i,j,k,code,ii;
+  int               i,j,k,ii;
   pointListStruct   *aList;
   pointStruct       *aPoint;
   XWindowAttributes vwInfo;
@@ -64,7 +64,7 @@ writeViewport(int thingsToWrite)
   XGetWindowAttributes(dsply,viewport->titleWindow,&vwInfo);
   sprintf(viewDirName,"%s%s",filename,".VIEW"); 
   sprintf(command,"%s%s%s","rm -r ",viewDirName," >  /dev/null 2>&1");
-  code = system(command);
+  system(command);
   sprintf(command,"%s%s%s","mkdir ",viewDirName," > /dev/null 2>&1");
   if (system(command)) {
     fprintf(stderr,"   Error: Cannot create %s\n",viewDirName);
@@ -153,7 +153,7 @@ writeViewport(int thingsToWrite)
             /*** Create the bitmap (bitmaps need leaf name) ***/
           sprintf(viewBitmapFilename,"%s%s",viewDirName,"/image.bm");
           XGetWindowAttributes(dsply,viewport->viewWindow,&vwInfo);
-          code = XWriteBitmapFile(dsply,viewBitmapFilename,
+          XWriteBitmapFile(dsply,viewBitmapFilename,
                                   viewport->titleWindow,vwInfo.width,
                                   vwInfo.height+vwInfo.border_width+20,-1,-1);
           break;
@@ -173,7 +173,7 @@ writeViewport(int thingsToWrite)
           drawViewport(Xoption);
           writeTitle();
           sprintf(viewBitmapFilename,"%s%s%s",viewDirName,"/","image.bm");
-          code = XWriteBitmapFile(dsply,viewBitmapFilename,
+          XWriteBitmapFile(dsply,viewBitmapFilename,
                                   viewport->titleWindow,vwInfo.width,
                                   vwInfo.height+vwInfo.border_width+20,-1,-1);
           mono = 0;