[Brlcad-commits] CVS: brlcad/src/libfb fb_obj.c,14.13,14.14 fbserv_obj.c,14.11,14.12 if_ogl.c,14.22,14.23 tcl.c,14.15,14.16

[Sean M. <br...@us...>]

Update of /cvsroot/brlcad/brlcad/src/libfb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15892

Modified Files:
	fb_obj.c fbserv_obj.c if_ogl.c tcl.c 
Log Message:
quell intel on altix compiler warnings

Index: fb_obj.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libfb/fb_obj.c,v
retrieving revision 14.13
retrieving revision 14.14
diff -w -u -r14.13 -r14.14
--- fb_obj.c	23 Jan 2006 00:07:35 -0000	14.13
+++ fb_obj.c	25 Mar 2006 00:03:48 -0000	14.14
@@ -42,6 +42,8 @@
 
 #include "common.h"
 
+#include <stdlib.h>
+
 #include "tcl.h"
 #include "machine.h"
 #include "cmd.h"                  /* includes bu.h */

Index: fbserv_obj.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libfb/fbserv_obj.c,v
retrieving revision 14.11
retrieving revision 14.12
diff -w -u -r14.11 -r14.12
--- fbserv_obj.c	23 Jan 2006 00:04:36 -0000	14.11
+++ fbserv_obj.c	25 Mar 2006 00:03:48 -0000	14.12
@@ -41,6 +41,7 @@
 /*@}*/
 #include "common.h"
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
 

Index: if_ogl.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libfb/if_ogl.c,v
retrieving revision 14.22
retrieving revision 14.23
diff -w -u -r14.22 -r14.23
--- if_ogl.c	18 Jan 2006 06:46:16 -0000	14.22
+++ if_ogl.c	25 Mar 2006 00:03:48 -0000	14.23
@@ -73,6 +73,13 @@
 #ifdef HAVE_GL_GL_H
 #  include <GL/gl.h>
 #endif
+#ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+#endif
+
 #undef RED
 
 #include "machine.h"

Index: tcl.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libfb/tcl.c,v
retrieving revision 14.15
retrieving revision 14.16
diff -w -u -r14.15 -r14.16
--- tcl.c	5 Feb 2006 17:31:41 -0000	14.15
+++ tcl.c	25 Mar 2006 00:03:48 -0000	14.16
@@ -64,8 +64,8 @@
 		return TCL_ERROR; \
 	}else if(*((long *)(_ptr)) != (_magic)){ \
 		bu_vls_init(&_fb_vls); \
-		bu_vls_printf(&_fb_vls, "ERROR: bad %s ptr x%x, s/b x%x, was x%x, file %s, line %d\n", \
-		_str, _ptr, _magic, *((long *)(_ptr)), __FILE__, __LINE__); \
+		bu_vls_printf(&_fb_vls, "ERROR: bad %s ptr x%lx, s/b x%x, was x%lx, file %s, line %d\n", \
+		_str, (long)_ptr, _magic, (long)*((long *)(_ptr)), __FILE__, __LINE__); \
 		Tcl_AppendResult(interp, bu_vls_addr(&_fb_vls), (char *)NULL); \
 		bu_vls_free(&_fb_vls); \
 \