Revision: 52768
http://brlcad.svn.sourceforge.net/brlcad/?rev=52768&view=rev
Author: n_reed
Date: 2012-10-04 14:48:29 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
Some fixes related to recent dm changes: incorrect argument type, need dm.h for
export symbol, dm_Null recently renamed to dm_null.
Modified Paths:
--------------
brlcad/trunk/include/dm-Null.h
brlcad/trunk/src/mged/mged.c
brlcad/trunk/src/mged/mged_dm.h
brlcad/trunk/src/util/pl-dm.c
Modified: brlcad/trunk/include/dm-Null.h
===================================================================
--- brlcad/trunk/include/dm-Null.h 2012-10-04 14:40:58 UTC (rev 52767)
+++ brlcad/trunk/include/dm-Null.h 2012-10-04 14:48:29 UTC (rev 52768)
@@ -24,6 +24,7 @@
*/
#ifndef __DM_NULL__
#define __DM_NULL__
+#include "dm.h"
DM_EXPORT extern struct dm dm_null;
Modified: brlcad/trunk/src/mged/mged.c
===================================================================
--- brlcad/trunk/src/mged/mged.c 2012-10-04 14:40:58 UTC (rev 52767)
+++ brlcad/trunk/src/mged/mged.c 2012-10-04 14:48:29 UTC (rev 52768)
@@ -1295,7 +1295,7 @@
predictor_init();
BU_GET(dmp, struct dm);
- *dmp = dm_Null;
+ *dmp = dm_null;
bu_vls_init(&pathName);
bu_vls_init(&tkName);
bu_vls_init(&dName);
Modified: brlcad/trunk/src/mged/mged_dm.h
===================================================================
--- brlcad/trunk/src/mged/mged_dm.h 2012-10-04 14:40:58 UTC (rev 52767)
+++ brlcad/trunk/src/mged/mged_dm.h 2012-10-04 14:48:29 UTC (rev 52768)
@@ -30,6 +30,7 @@
#include "dm.h" /* struct dm */
#include "dm_xvars.h"
+#include "dm-Null.h"
#include "fb.h" /* FBIO */
#include "pkg.h" /* struct pkg_conn */
Modified: brlcad/trunk/src/util/pl-dm.c
===================================================================
--- brlcad/trunk/src/util/pl-dm.c 2012-10-04 14:40:58 UTC (rev 52767)
+++ brlcad/trunk/src/util/pl-dm.c 2012-10-04 14:48:29 UTC (rev 52768)
@@ -1056,7 +1056,7 @@
static int
X_dmInit()
{
- int windowbounds[6] = { 2047, -2048, 2047, -2048, 2047, -2048 };
+ fastf_t windowbounds[6] = { 2047, -2048, 2047, -2048, 2047, -2048 };
const char *av[4];
av[0] = "X_open";
@@ -1082,7 +1082,7 @@
static int
Ogl_dmInit()
{
- int windowbounds[6] = { 2047, -2048, 2047, -2048, 2047, -2048 };
+ fastf_t windowbounds[6] = { 2047, -2048, 2047, -2048, 2047, -2048 };
char *av[4];
av[0] = "Ogl_open";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
