Revision: 41865
http://brlcad.svn.sourceforge.net/brlcad/?rev=41865&view=rev
Author: starseeker
Date: 2010-12-30 19:11:23 +0000 (Thu, 30 Dec 2010)
Log Message:
-----------
Er, fix it at the source instead of casting it.
Modified Paths:
--------------
brlcad/branches/cmake/src/mged/dm-ogl.c
brlcad/branches/cmake/src/util/pl-dm.c
Modified: brlcad/branches/cmake/src/mged/dm-ogl.c
===================================================================
--- brlcad/branches/cmake/src/mged/dm-ogl.c 2010-12-30 19:10:11 UTC (rev
41864)
+++ brlcad/branches/cmake/src/mged/dm-ogl.c 2010-12-30 19:11:23 UTC (rev
41865)
@@ -93,7 +93,7 @@
int
Ogl_dm_init(struct dm_list *o_dm_list,
int argc,
- char *argv[])
+ const char *argv[])
{
struct bu_vls vls;
@@ -104,7 +104,7 @@
Tk_DeleteGenericHandler(doEvent, (ClientData)NULL);
- if ((dmp = dm_open(INTERP, DM_TYPE_OGL, argc-1, (const char **)argv)) ==
DM_NULL)
+ if ((dmp = dm_open(INTERP, DM_TYPE_OGL, argc-1, argv)) == DM_NULL)
return TCL_ERROR;
/*XXXX this eventually needs to move into Ogl's private structure */
Modified: brlcad/branches/cmake/src/util/pl-dm.c
===================================================================
--- brlcad/branches/cmake/src/util/pl-dm.c 2010-12-30 19:10:11 UTC (rev
41864)
+++ brlcad/branches/cmake/src/util/pl-dm.c 2010-12-30 19:11:23 UTC (rev
41865)
@@ -1064,14 +1064,14 @@
X_dmInit()
{
int windowbounds[6] = { 2047, -2048, 2047, -2048, 2047, -2048 };
- char *av[4];
+ const char *av[4];
av[0] = "X_open";
av[1] = "-i";
av[2] = "sampler_bind_dm";
av[3] = (char *)NULL;
- if ((dmp = DM_OPEN(INTERP, DM_TYPE_X, 3, (const char **)av)) == DM_NULL) {
+ if ((dmp = DM_OPEN(INTERP, DM_TYPE_X, 3, av)) == DM_NULL) {
Tcl_AppendResult(INTERP, "Failed to open a display manager\n", (char
*)NULL);
return TCL_ERROR;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
