[Brlcad-commits] CVS: brlcad/src/libdm dm-Null.c,14.5,14.6 dm-generic.c,14.8,14.9 dm-ogl_win.c,14.10,14.11 dm-plot.c,14.6,14.7 dm-ps.c,14.6,14.7 dm_obj.c,14.10,14.11 query.c,14.7,14.8 tcl.c,14.6,14.7

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

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

Modified Files:
	dm-Null.c dm-generic.c dm-ogl_win.c dm-plot.c dm-ps.c dm_obj.c 
	query.c tcl.c 
Log Message:
convert WIN32 define checks to _WIN32 since the latter is one of the defaults provided by MSVC whereas the prior is not.  remove some of them related to header inclusions using HAVE_ defines instead.

Index: dm-Null.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libdm/dm-Null.c,v
retrieving revision 14.5
retrieving revision 14.6
diff -w -u -r14.5 -r14.6
--- dm-Null.c	30 Jan 2005 20:30:47 -0000	14.5
+++ dm-Null.c	28 May 2005 02:14:50 -0000	14.6
@@ -24,14 +24,13 @@
 
 #include "common.h"
 
-
-#include "tcl.h"
-
 #define PLOTBOUND       1000.0  /* Max magnification in Rot matrix */
 #include <stdio.h>
-#ifndef WIN32
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
+
+#include "tcl.h"
 #include "machine.h"
 #include "bu.h"
 #include "vmath.h"

Index: dm-generic.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libdm/dm-generic.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- dm-generic.c	30 Jan 2005 20:30:47 -0000	14.8
+++ dm-generic.c	28 May 2005 02:14:50 -0000	14.9
@@ -60,7 +60,7 @@
 #endif /* DM_OGL */
 #endif /* DM_X */
 
-#ifdef WIN32
+#ifdef _WIN32
 extern struct dm *ogl_open();
 extern void ogl_fogHint();
 extern int ogl_share_dlist();
@@ -77,7 +77,7 @@
 		return plot_open(interp, argc, argv);
 	case DM_TYPE_PS:
 		return ps_open(interp, argc, argv);
-#ifndef WIN32
+#ifndef _WIN32
 #ifdef DM_X
 	case DM_TYPE_X:
 		return X_open(interp, argc, argv);

Index: dm-ogl_win.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libdm/dm-ogl_win.c,v
retrieving revision 14.10
retrieving revision 14.11
diff -w -u -r14.10 -r14.11
--- dm-ogl_win.c	20 Mar 2005 00:19:56 -0000	14.10
+++ dm-ogl_win.c	28 May 2005 02:14:50 -0000	14.11
@@ -75,7 +75,7 @@
 #endif
 
 static int ogl_actively_drawing;
-#ifndef WIN32
+#ifndef _WIN32
 HIDDEN XVisualInfo *ogl_choose_visual();
 #else
 HIDDEN PIXELFORMATDESCRIPTOR *ogl_choose_visual();
@@ -205,7 +205,7 @@
   int nclass = 0;
   struct bu_vls str;
   struct bu_vls init_proc_vls;
-#ifndef WIN32
+#ifndef _WIN32
   int j, k;
   int ndevices;
   int unused;
@@ -290,7 +290,7 @@
   /* this is important so that ogl_configureWin knows to set the font */
   ((struct dm_xvars *)dmp->dm_vars.pub_vars)->fontstruct = NULL;
 
-#ifndef WIN32
+#ifndef _WIN32
   if((tmp_dpy = XOpenDisplay(bu_vls_addr(&dmp->dm_dName))) == NULL){
     bu_vls_free(&init_proc_vls);
     (void)ogl_close(dmp);
@@ -339,7 +339,7 @@
 	dmp->dm_width;
   }
 
-#ifndef WIN32
+#ifndef _WIN32
   XCloseDisplay(tmp_dpy);
 #endif
 
@@ -375,7 +375,7 @@
   }
 
   if( ((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin == NULL ) {
-/*#ifdef WIN32*/
+/*#ifdef _WIN32*/
 #if 0
       Tcl_AppendResult(interp, "open_ogl: Failed to open ",
 		       bu_vls_addr(&dmp->dm_pathName),
@@ -397,7 +397,7 @@
 		&dmp->dm_pathName);
 
   if (Tcl_Eval(interp, bu_vls_addr(&str)) == TCL_ERROR) {
-/*#ifdef WIN32*/
+/*#ifdef _WIN32*/
 #if 0
       Tcl_AppendResult(interp, "open_ogl: _init_dm failed\n");
 #else
@@ -419,7 +419,7 @@
 		     dmp->dm_width,
 		     dmp->dm_height);
 
-#ifndef WIN32
+#ifndef _WIN32
   /* must do this before MakeExist */
   if((((struct dm_xvars *)dmp->dm_vars.pub_vars)->vip=ogl_choose_visual(dmp,
 				    ((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin)) == NULL){
@@ -437,7 +437,7 @@
     Tk_WindowId(((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin);
   dmp->dm_id = ((struct dm_xvars *)dmp->dm_vars.pub_vars)->win;
 
-#ifdef WIN32
+#ifdef _WIN32
   hwnd = TkWinGetHWND(((struct dm_xvars *)dmp->dm_vars.pub_vars)->win);
   hdc = GetDC(hwnd);
   ((struct dm_xvars *)dmp->dm_vars.pub_vars)->hdc = hdc;
@@ -614,7 +614,7 @@
   glLoadIdentity();
   ((struct ogl_vars *)dmp->dm_vars.priv_vars)->face_flag = 1;	/* faceplate matrix is on top of stack */
 
-#ifdef WIN32
+#ifdef _WIN32
     if (!wglMakeCurrent((HDC)NULL, (HGLRC)NULL)) {
 	LPVOID buf;
 
@@ -648,7 +648,7 @@
 {
   GLfloat backgnd[4];
   GLfloat vf;
-#ifndef WIN32
+#ifndef _WIN32
   GLXContext old_glxContext;
 #else
   HGLRC old_glxContext;
@@ -662,7 +662,7 @@
 
     old_glxContext = ((struct ogl_vars *)dmp1->dm_vars.priv_vars)->glxc;
 
-#ifndef WIN32
+#ifndef _WIN32
     if ((((struct ogl_vars *)dmp1->dm_vars.priv_vars)->glxc =
 	 glXCreateContext(((struct dm_xvars *)dmp1->dm_vars.pub_vars)->dpy,
 			  ((struct dm_xvars *)dmp1->dm_vars.pub_vars)->vip,
@@ -752,7 +752,7 @@
     ((struct ogl_vars *)dmp1->dm_vars.priv_vars)->face_flag = 1; /* faceplate matrix is on top of stack */
 
     /* destroy old context */
-#ifndef WIN32
+#ifndef _WIN32
     glXMakeCurrent(((struct dm_xvars *)dmp1->dm_vars.pub_vars)->dpy, None, NULL);
     glXDestroyContext(((struct dm_xvars *)dmp1->dm_vars.pub_vars)->dpy, old_glxContext);
 #else
@@ -765,7 +765,7 @@
 
     old_glxContext = ((struct ogl_vars *)dmp2->dm_vars.priv_vars)->glxc;
 
-#ifndef WIN32
+#ifndef _WIN32
     if ((((struct ogl_vars *)dmp2->dm_vars.priv_vars)->glxc =
 	 glXCreateContext(((struct dm_xvars *)dmp2->dm_vars.pub_vars)->dpy,
 			  ((struct dm_xvars *)dmp2->dm_vars.pub_vars)->vip,
@@ -846,7 +846,7 @@
     ((struct ogl_vars *)dmp2->dm_vars.priv_vars)->face_flag = 1; /* faceplate matrix is on top of stack */
 
     /* destroy old context */
-#ifndef WIN32
+#ifndef _WIN32
     glXMakeCurrent(((struct dm_xvars *)dmp2->dm_vars.pub_vars)->dpy, None, NULL);
     glXDestroyContext(((struct dm_xvars *)dmp2->dm_vars.pub_vars)->dpy, old_glxContext);
 #else
@@ -870,7 +870,7 @@
 {
     if(((struct dm_xvars *)dmp->dm_vars.pub_vars)->dpy){
 	if(((struct ogl_vars *)dmp->dm_vars.priv_vars)->glxc){
-#ifndef WIN32
+#ifndef _WIN32
 	    glXMakeCurrent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->dpy, None, NULL);
 	    glXDestroyContext(((struct dm_xvars *)dmp->dm_vars.pub_vars)->dpy,
 			      ((struct ogl_vars *)dmp->dm_vars.priv_vars)->glxc);
@@ -919,7 +919,7 @@
 
     ogl_actively_drawing = 1;
 
-#ifndef WIN32
+#ifndef _WIN32
     if (!glXMakeCurrent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->dpy,
 			((struct dm_xvars *)dmp->dm_vars.pub_vars)->win,
 			((struct ogl_vars *)dmp->dm_vars.priv_vars)->glxc)){
@@ -1000,7 +1000,7 @@
     }
 
     if (((struct ogl_vars *)dmp->dm_vars.priv_vars)->mvars.doublebuffer){
-#ifndef WIN32
+#ifndef _WIN32
 	glXSwapBuffers(((struct dm_xvars *)dmp->dm_vars.pub_vars)->dpy,
 		       ((struct dm_xvars *)dmp->dm_vars.pub_vars)->win);
 #else
@@ -1037,7 +1037,7 @@
     glFinish();
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
     if (!wglMakeCurrent((HDC)NULL, (HGLRC)NULL)) {
 	LPVOID buf;
 
@@ -1458,7 +1458,7 @@
     ((struct ogl_vars *)dmp->dm_vars.priv_vars)->b = b / 255.0;
 
     if (((struct ogl_vars *)dmp->dm_vars.priv_vars)->mvars.doublebuffer) {
-#ifndef WIN32
+#ifndef _WIN32
 	if (!glXMakeCurrent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->dpy,
 			    ((struct dm_xvars *)dmp->dm_vars.pub_vars)->win,
 			    ((struct ogl_vars *)dmp->dm_vars.priv_vars)->glxc)) {
@@ -1470,7 +1470,7 @@
 	    return TCL_ERROR;
 	}
 
-#ifndef WIN32
+#ifndef _WIN32
 	glXSwapBuffers(((struct dm_xvars *)dmp->dm_vars.pub_vars)->dpy,
 		       ((struct dm_xvars *)dmp->dm_vars.pub_vars)->win);
 #else
@@ -1543,7 +1543,7 @@
 }
 
 #define OGL_DO_STEREO 1
-#ifndef WIN32
+#ifndef _WIN32
 /* currently, get a double buffered rgba visual that works with Tk and
  * OpenGL
  */
@@ -1746,7 +1746,7 @@
 #endif
 
 
-#ifndef WIN32
+#ifndef _WIN32
 /* 
  *			O G L _ C O N F I G U R E W I N
  *
@@ -2114,7 +2114,7 @@
     dmp->dm_light = lighting_on;
     ((struct ogl_vars *)dmp->dm_vars.priv_vars)->mvars.lighting_on = dmp->dm_light;
 
-#ifndef WIN32
+#ifndef _WIN32
     if (!glXMakeCurrent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->dpy,
 			((struct dm_xvars *)dmp->dm_vars.pub_vars)->win,
 			((struct ogl_vars *)dmp->dm_vars.priv_vars)->glxc)) {
@@ -2156,7 +2156,7 @@
     dmp->dm_transparency = transparency_on;
     ((struct ogl_vars *)dmp->dm_vars.priv_vars)->mvars.transparency_on = dmp->dm_transparency;
 
-#ifndef WIN32
+#ifndef _WIN32
     if (!glXMakeCurrent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->dpy,
 			((struct dm_xvars *)dmp->dm_vars.pub_vars)->win,
 			((struct ogl_vars *)dmp->dm_vars.priv_vars)->glxc)){
@@ -2188,7 +2188,7 @@
 
     dmp->dm_depthMask = enable;
 
-#ifndef WIN32
+#ifndef _WIN32
     if (!glXMakeCurrent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->dpy,
 			((struct dm_xvars *)dmp->dm_vars.pub_vars)->win,
 			((struct ogl_vars *)dmp->dm_vars.priv_vars)->glxc)){
@@ -2219,7 +2219,7 @@
     dmp->dm_zbuffer = zbuffer_on;
     ((struct ogl_vars *)dmp->dm_vars.priv_vars)->mvars.zbuffer_on = dmp->dm_zbuffer;
 
-#ifndef WIN32
+#ifndef _WIN32
     if (!glXMakeCurrent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->dpy,
 			((struct dm_xvars *)dmp->dm_vars.pub_vars)->win,
 			((struct ogl_vars *)dmp->dm_vars.priv_vars)->glxc)){
@@ -2254,7 +2254,7 @@
     if (dmp->dm_debugLevel)
 	bu_log("ogl_beginDList()\n");
 
-#ifndef WIN32
+#ifndef _WIN32
     if (!glXMakeCurrent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->dpy,
 			((struct dm_xvars *)dmp->dm_vars.pub_vars)->win,
 			((struct ogl_vars *)dmp->dm_vars.priv_vars)->glxc)){
@@ -2302,7 +2302,7 @@
     if (dmp->dm_debugLevel)
 	bu_log("ogl_freeDLists()\n");
 
-#ifndef WIN32
+#ifndef _WIN32
     if (!glXMakeCurrent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->dpy,
 			((struct dm_xvars *)dmp->dm_vars.pub_vars)->win,
 			((struct ogl_vars *)dmp->dm_vars.priv_vars)->glxc)){

Index: dm-plot.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libdm/dm-plot.c,v
retrieving revision 14.6
retrieving revision 14.7
diff -w -u -r14.6 -r14.7
--- dm-plot.c	30 Jan 2005 20:30:47 -0000	14.6
+++ dm-plot.c	28 May 2005 02:14:50 -0000	14.7
@@ -43,17 +43,16 @@
 
 #include "common.h"
 
-
-#include "tcl.h"
-
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
 
-#ifndef WIN32
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>		/* for struct timeval */
 #endif
+
+#include "tcl.h"
 #include "machine.h"
 #include "bu.h"
 #include "vmath.h"

Index: dm-ps.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libdm/dm-ps.c,v
retrieving revision 14.6
retrieving revision 14.7
diff -w -u -r14.6 -r14.7
--- dm-ps.c	30 Jan 2005 20:30:47 -0000	14.6
+++ dm-ps.c	28 May 2005 02:14:50 -0000	14.7
@@ -41,16 +41,17 @@
 
 #include "common.h"
 
-
-#include "tcl.h"
-
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifndef WIN32
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>		/* for struct timeval */
 #endif
+
+
+#include "tcl.h"
+
 #include "machine.h"
 #include "bu.h"
 #include "vmath.h"

Index: dm_obj.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libdm/dm_obj.c,v
retrieving revision 14.10
retrieving revision 14.11
diff -w -u -r14.10 -r14.11
--- dm_obj.c	26 Mar 2005 20:25:38 -0000	14.10
+++ dm_obj.c	28 May 2005 02:14:50 -0000	14.11
@@ -39,14 +39,14 @@
 #endif
 #include <math.h>
 
-#if defined(DM_X) || defined(WIN32)
+#if defined(DM_X) || defined(_WIN32)
 #  include "tk.h"
 #  include <X11/Xutil.h>
 #else
 #  include "tcl.h"
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 #  include <tkwinport.h>
 #else
 #  if 1
@@ -69,13 +69,13 @@
 #include "png.h"
 #include "zlib.h"
 
-#if defined(DM_X) || defined(WIN32)
+#if defined(DM_X) || defined(_WIN32)
 
 #include "dm-X.h"
 #include "dm_xvars.h"
 
 #ifdef DM_OGL
-#  ifndef WIN32
+#  ifdef HAVE_GL_GLX_H
 #    include <GL/glx.h>
 #  endif
 #  include <GL/gl.h>
@@ -87,7 +87,7 @@
 #endif /* DM_OGL */
 
 #ifdef USE_FBSERV
-#  ifndef WIN32
+#  ifndef _WIN32
 /* These functions live in libfb. */
 extern int _X24_open_existing();
 extern int X24_close_existing();
@@ -95,7 +95,7 @@
 extern int fb_refresh();
 #endif /* USE_FBSERV */
 
-#endif /* DM_X || WIN32 */
+#endif /* DM_X || _WIN32 */
 
 
 static int dmo_open_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char **argv);
@@ -142,7 +142,7 @@
 static int dmo_size_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char **argv);
 static int dmo_get_aspect_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char **argv);
 static int dmo_observer_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char **argv);
-#ifndef WIN32
+#ifndef _WIN32
 static int dmo_png_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char **argv);
 #endif
 static int dmo_clearBufferAfter_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char **argv);
@@ -188,7 +188,7 @@
 	{"normal",		dmo_normal_tcl},
 	{"observer",		dmo_observer_tcl},
 	{"perspective",		dmo_perspective_tcl},
-#ifndef WIN32
+#ifndef _WIN32
 	{"png",		        dmo_png_tcl},
 #endif
 #ifdef USE_FBSERV
@@ -330,7 +330,7 @@
 		}
 	}
 
-#ifndef WIN32
+#ifndef _WIN32
 #ifdef DM_X
 	/* find display manager type */
 	if (argv[2][0] == 'X' || argv[2][0] == 'x')
@@ -2681,7 +2681,7 @@
 }
 
 
-#ifndef WIN32
+#ifndef _WIN32
 
 #if 1
 #define DM_REVERSE_COLOR_BYTE_ORDER(_shift,_mask) { \
@@ -3183,7 +3183,7 @@
 	}
 
 	switch (dmop->dmo_dmp->dm_type) {
-#ifndef WIN32
+#ifndef _WIN32
 	case DM_TYPE_X:
 		*dmop->dmo_fbs.fbs_fbp = X24_interface; /* struct copy */
 
@@ -3248,7 +3248,7 @@
 	_fb_pgflush(dmop->dmo_fbs.fbs_fbp);
 
 	switch (dmop->dmo_dmp->dm_type) {
-#ifndef WIN32
+#ifndef _WIN32
 	case DM_TYPE_X:
 		X24_close_existing(dmop->dmo_fbs.fbs_fbp);
 		break;

Index: query.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libdm/query.c,v
retrieving revision 14.7
retrieving revision 14.8
diff -w -u -r14.7 -r14.8
--- query.c	21 Mar 2005 05:08:38 -0000	14.7
+++ query.c	28 May 2005 02:14:51 -0000	14.8
@@ -24,19 +24,15 @@
 
 #include "common.h"
 
-
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
 
-#if 0
-#include "tk.h"
-#else
-#include "tcl.h"
-#ifndef WIN32
+#ifdef HAVE_X11_XLIB_H
 #include <X11/Xlib.h>
 #endif
-#endif
+
+#include "tcl.h"
 
 #include "machine.h"
 #include "bu.h"

Index: tcl.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libdm/tcl.c,v
retrieving revision 14.6
retrieving revision 14.7
diff -w -u -r14.6 -r14.7
--- tcl.c	24 Mar 2005 16:09:25 -0000	14.6
+++ tcl.c	28 May 2005 02:14:51 -0000	14.7
@@ -41,7 +41,7 @@
 #include "dm.h"
 #include "cmd.h"
 
-#if defined(DM_X) || defined(WIN32)
+#if defined(DM_X) || defined(_WIN32)
 /* from libdm/query.c */
 extern int dm_validXType();
 extern char *dm_bestXType();
@@ -56,7 +56,7 @@
 int vectorThreshold = 100000;
 
 HIDDEN struct bu_cmdtab cmdtab[] = {
-#if defined(DM_X) || defined(WIN32)
+#if defined(DM_X) || defined(_WIN32)
 	{"dm_validXType",	dm_validXType_tcl},
 	{"dm_bestXType",	dm_bestXType_tcl},
 #endif
@@ -93,7 +93,7 @@
 	return TCL_OK;
 }
 
-#if defined(DM_X) || defined(WIN32)
+#if defined(DM_X) || defined(_WIN32)
 HIDDEN int
 dm_validXType_tcl(clientData, interp, argc, argv)
      ClientData clientData;