Revision: 76672
http://sourceforge.net/p/brlcad/code/76672
Author: starseeker
Date: 2020-08-06 17:18:58 +0000 (Thu, 06 Aug 2020)
Log Message:
-----------
Move the extern declarations down into subheaders (except for the null dm)
Modified Paths:
--------------
brlcad/trunk/include/dm.h
brlcad/trunk/src/libdm/X/dm-X.h
brlcad/trunk/src/libdm/glx/dm-ogl.h
brlcad/trunk/src/libdm/osgl/dm-osgl.h
brlcad/trunk/src/libdm/plot/dm-plot.h
brlcad/trunk/src/libdm/postscript/dm-ps.h
brlcad/trunk/src/libdm/qt/dm-qt.h
brlcad/trunk/src/libdm/tk/dm-tk.h
brlcad/trunk/src/libdm/txt/dm-txt.c
brlcad/trunk/src/libdm/wgl/dm-wgl.h
Modified: brlcad/trunk/include/dm.h
===================================================================
--- brlcad/trunk/include/dm.h 2020-08-06 17:10:08 UTC (rev 76671)
+++ brlcad/trunk/include/dm.h 2020-08-06 17:18:58 UTC (rev 76672)
@@ -74,18 +74,7 @@
void *dmh_data;
};
-/* TODO - after plugins are established, these should be movable to
- * the private subheaders */
DM_EXPORT extern struct dm dm_null;
-DM_EXPORT extern struct dm dm_ogl;
-DM_EXPORT extern struct dm dm_plot;
-DM_EXPORT extern struct dm dm_ps;
-DM_EXPORT extern struct dm dm_tk;
-DM_EXPORT extern struct dm dm_wgl;
-DM_EXPORT extern struct dm dm_X;
-DM_EXPORT extern struct dm dm_txt;
-DM_EXPORT extern struct dm dm_qt;
-DM_EXPORT extern struct dm dm_osgl;
DM_EXPORT extern void *dm_interp(struct dm *dmp);
DM_EXPORT extern int dm_share_dlist(struct dm *dmp1,
Modified: brlcad/trunk/src/libdm/X/dm-X.h
===================================================================
--- brlcad/trunk/src/libdm/X/dm-X.h 2020-08-06 17:10:08 UTC (rev 76671)
+++ brlcad/trunk/src/libdm/X/dm-X.h 2020-08-06 17:18:58 UTC (rev 76672)
@@ -59,6 +59,8 @@
} \
}
+extern struct dm dm_X;
+
struct x_vars {
GC gc;
Pixmap pix;
Modified: brlcad/trunk/src/libdm/glx/dm-ogl.h
===================================================================
--- brlcad/trunk/src/libdm/glx/dm-ogl.h 2020-08-06 17:10:08 UTC (rev 76671)
+++ brlcad/trunk/src/libdm/glx/dm-ogl.h 2020-08-06 17:18:58 UTC (rev 76672)
@@ -66,6 +66,8 @@
} \
}
+extern struct dm dm_ogl;
+
#define Ogl_MV_O(_m) offsetof(struct modifiable_ogl_vars, _m)
struct modifiable_ogl_vars {
Modified: brlcad/trunk/src/libdm/osgl/dm-osgl.h
===================================================================
--- brlcad/trunk/src/libdm/osgl/dm-osgl.h 2020-08-06 17:10:08 UTC (rev
76671)
+++ brlcad/trunk/src/libdm/osgl/dm-osgl.h 2020-08-06 17:18:58 UTC (rev
76672)
@@ -94,6 +94,8 @@
/* Map +/-2048 GED space into -1.0..+1.0 :: x/2048*/
#define GED2IRIS(x) (((float)(x))*0.00048828125)
+extern struct dm dm_osgl;
+
#define Osgl_MV_O(_m) offsetof(struct modifiable_osgl_vars, _m)
struct modifiable_osgl_vars {
Modified: brlcad/trunk/src/libdm/plot/dm-plot.h
===================================================================
--- brlcad/trunk/src/libdm/plot/dm-plot.h 2020-08-06 17:10:08 UTC (rev
76671)
+++ brlcad/trunk/src/libdm/plot/dm-plot.h 2020-08-06 17:18:58 UTC (rev
76672)
@@ -37,6 +37,8 @@
#define GED_TO_PLOT(x) (x)
#define PLOT_TO_GED(x) (x)
+extern struct dm dm_plot;
+
struct plot_vars {
struct bu_list l;
FILE *up_fp;
Modified: brlcad/trunk/src/libdm/postscript/dm-ps.h
===================================================================
--- brlcad/trunk/src/libdm/postscript/dm-ps.h 2020-08-06 17:10:08 UTC (rev
76671)
+++ brlcad/trunk/src/libdm/postscript/dm-ps.h 2020-08-06 17:18:58 UTC (rev
76672)
@@ -34,6 +34,8 @@
*/
#define GED_TO_PS(x) ((int)((x)+2048))
+extern struct dm dm_ps;
+
struct ps_vars {
struct bu_list l;
FILE *ps_fp;
Modified: brlcad/trunk/src/libdm/qt/dm-qt.h
===================================================================
--- brlcad/trunk/src/libdm/qt/dm-qt.h 2020-08-06 17:10:08 UTC (rev 76671)
+++ brlcad/trunk/src/libdm/qt/dm-qt.h 2020-08-06 17:18:58 UTC (rev 76672)
@@ -85,6 +85,8 @@
int devbuttonrelease;
};
+extern struct dm dm_qt;
+
#endif /* DM_QT_H */
/** @} */
Modified: brlcad/trunk/src/libdm/tk/dm-tk.h
===================================================================
--- brlcad/trunk/src/libdm/tk/dm-tk.h 2020-08-06 17:10:08 UTC (rev 76671)
+++ brlcad/trunk/src/libdm/tk/dm-tk.h 2020-08-06 17:18:58 UTC (rev 76672)
@@ -36,6 +36,8 @@
#define INIT_XCOLOR(c) memset((c), 0, sizeof(XColor))
+extern struct dm dm_tk;
+
struct tk_vars {
GC gc;
Pixmap pix;
Modified: brlcad/trunk/src/libdm/txt/dm-txt.c
===================================================================
--- brlcad/trunk/src/libdm/txt/dm-txt.c 2020-08-06 17:10:08 UTC (rev 76671)
+++ brlcad/trunk/src/libdm/txt/dm-txt.c 2020-08-06 17:18:58 UTC (rev 76672)
@@ -32,6 +32,8 @@
#include "dm.h"
#include "../include/private.h"
+extern struct dm dm_txt;
+
struct dm *
txt_open(void *interp, int argc, const char **argv)
{
Modified: brlcad/trunk/src/libdm/wgl/dm-wgl.h
===================================================================
--- brlcad/trunk/src/libdm/wgl/dm-wgl.h 2020-08-06 17:10:08 UTC (rev 76671)
+++ brlcad/trunk/src/libdm/wgl/dm-wgl.h 2020-08-06 17:18:58 UTC (rev 76672)
@@ -46,6 +46,8 @@
/* Map +/-2048 GED space into -1.0..+1.0 :: x/2048*/
#define GED2IRIS(x) (((float)(x))*0.00048828125)
+extern struct dm dm_wgl;
+
#define Ogl_MV_O(_m) offsetof(struct modifiable_ogl_vars, _m)
struct modifiable_ogl_vars {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
