Revision: 75430
          http://sourceforge.net/p/brlcad/code/75430
Author:   starseeker
Date:     2020-04-17 12:46:38 +0000 (Fri, 17 Apr 2020)
Log Message:
-----------
fold fb_private.h into dm_private.h

Modified Paths:
--------------
    brlcad/branches/dm-fb-merge/src/fbserv/fbserv.c
    brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
    brlcad/branches/dm-fb-merge/src/libdm/X/if_X24.c
    brlcad/branches/dm-fb-merge/src/libdm/dm_private.h
    brlcad/branches/dm-fb-merge/src/libdm/fb_generic.c
    brlcad/branches/dm-fb-merge/src/libdm/fb_obj.c
    brlcad/branches/dm-fb-merge/src/libdm/fb_paged_io.c
    brlcad/branches/dm-fb-merge/src/libdm/fb_rect.c
    brlcad/branches/dm-fb-merge/src/libdm/fb_util.c
    brlcad/branches/dm-fb-merge/src/libdm/fbserv_obj.c
    brlcad/branches/dm-fb-merge/src/libdm/glx/if_ogl.c
    brlcad/branches/dm-fb-merge/src/libdm/if_disk.c
    brlcad/branches/dm-fb-merge/src/libdm/if_mem.c
    brlcad/branches/dm-fb-merge/src/libdm/if_remote.c
    brlcad/branches/dm-fb-merge/src/libdm/if_stack.c
    brlcad/branches/dm-fb-merge/src/libdm/null/if_null.c
    brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp
    brlcad/branches/dm-fb-merge/src/libdm/qt/if_qt.cpp
    brlcad/branches/dm-fb-merge/src/libdm/tcl.c
    brlcad/branches/dm-fb-merge/src/libdm/tk/if_tk.c
    brlcad/branches/dm-fb-merge/src/libdm/txt/if_debug.c
    brlcad/branches/dm-fb-merge/src/libdm/wgl/if_wgl.c

Removed Paths:
-------------
    brlcad/branches/dm-fb-merge/src/libdm/fb_private.h

Modified: brlcad/branches/dm-fb-merge/src/fbserv/fbserv.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/fbserv/fbserv.c     2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/fbserv/fbserv.c     2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -76,7 +76,7 @@
 #include "bsocket.h"
 #include "bio.h"
 
-#include "../libdm/fb_private.h" /* for _fb_disk_enable */
+#include "../libdm/dm_private.h" /* for _fb_disk_enable */
 
 #include "bu/malloc.h"
 #include "bu/getopt.h"

Modified: brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt        2020-04-16 
21:19:14 UTC (rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt        2020-04-17 
12:46:38 UTC (rev 75430)
@@ -166,7 +166,6 @@
   X/if_X24.c
   dm_private.h
   dm_xvars.h
-  fb_private.h
   fontstash/LICENSE.fontstash
   fontstash/README.md
   fontstash/fontstash.h

Modified: brlcad/branches/dm-fb-merge/src/libdm/X/if_X24.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/if_X24.c    2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/if_X24.c    2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -74,7 +74,7 @@
 #include "bu/file.h"
 #include "bu/malloc.h"
 #include "bu/str.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "./fb_X.h"
 
 

Modified: brlcad/branches/dm-fb-merge/src/libdm/dm_private.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/dm_private.h  2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/dm_private.h  2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -28,6 +28,9 @@
 #ifndef DM_PRIVATE_H
 #define DM_PRIVATE_H
 
+#include <limits.h> /* For INT_MAX */
+#include <stdlib.h>
+
 #include "vmath.h"
 #include "dm.h"
 
@@ -171,6 +174,109 @@
        const char *value,
        void *data);
 
+/* declare all the possible interfaces */
+#ifdef IF_X
+FB_EXPORT extern struct fb X24_interface;
+#endif
+#ifdef IF_OGL
+FB_EXPORT extern struct fb ogl_interface;
+#endif
+#ifdef IF_OSGL
+FB_EXPORT extern struct fb osgl_interface;
+#endif
+#ifdef IF_WGL
+FB_EXPORT extern struct fb wgl_interface;
+#endif
+#ifdef IF_TK
+FB_EXPORT extern struct fb tk_interface;
+#endif
+#ifdef IF_QT
+FB_EXPORT extern struct fb qt_interface;
+#endif
+#ifdef IF_REMOTE
+FB_EXPORT extern struct fb remote_interface; /* not in list[] */
+#endif
+
+/* Always included */
+FB_EXPORT extern struct fb debug_interface, disk_interface, stk_interface;
+FB_EXPORT extern struct fb memory_interface, fb_null_interface;
+
+
+/* Shared memory (shmget et. al.) key common to multiple framebuffers */
+#define SHMEM_KEY 42
+
+/* Maximum memory buffer allocation.
+ *
+ * Care must be taken as this can result in a large default memory
+ * allocation that can have an impact on performance or minimum system
+ * requirements.  For example, 20*1024 results in a 20480x20480 buffer
+ * and a 1.6GB allocation.  Using 32*1024 results in a 4GB allocation.
+ */
+#define FB_XMAXSCREEN 20*1024 /* 1.6GB */
+#define FB_YMAXSCREEN 20*1024 /* 1.6GB */
+
+/* setting to 1 turns on general intrface debugging for all fb types */
+#define FB_DEBUG 0
+
+__BEGIN_DECLS
+
+/*
+ * Structure of color map in shared memory region.  Has exactly the
+ * same format as the SGI hardware "gammaramp" map Note that only the
+ * lower 8 bits are significant.
+ */
+struct fb_cmap {
+    short cmr[256];
+    short cmg[256];
+    short cmb[256];
+};
+
+
+/*
+ * This defines the format of the in-memory framebuffer copy.  The
+ * alpha component and reverse order are maintained for compatibility
+ * with /dev/sgi
+ */
+struct fb_pixel {
+    unsigned char blue;
+    unsigned char green;
+    unsigned char red;
+    unsigned char alpha;
+};
+
+
+/* Clipping structure for zoom/pan operations */
+struct fb_clip {
+    int xpixmin;       /* view clipping planes clipped to pixel memory space*/
+    int xpixmax;
+    int ypixmin;
+    int ypixmax;
+    int xscrmin;       /* view clipping planes */
+    int xscrmax;
+    int yscrmin;
+    int yscrmax;
+    double oleft;      /* glOrtho parameters */
+    double oright;
+    double otop;
+    double obottom;
+};
+
+/*
+ * Some functions and variables we couldn't hide.
+ * Not for general consumption.
+ */
+FB_EXPORT extern int _fb_disk_enable;
+FB_EXPORT extern int fb_sim_readrect(struct fb *ifp, int xmin, int ymin, int 
_width, int _height, unsigned char *pp);
+FB_EXPORT extern int fb_sim_writerect(struct fb *ifp, int xmin, int ymin, int 
_width, int _height, const unsigned char *pp);
+FB_EXPORT extern int fb_sim_bwreadrect(struct fb *ifp, int xmin, int ymin, int 
_width, int _height, unsigned char *pp);
+FB_EXPORT extern int fb_sim_bwwriterect(struct fb *ifp, int xmin, int ymin, 
int _width, int _height, const unsigned char *pp);
+FB_EXPORT extern int fb_sim_view(struct fb *ifp, int xcenter, int ycenter, int 
xzoom, int yzoom);
+FB_EXPORT extern int fb_sim_getview(struct fb *ifp, int *xcenter, int 
*ycenter, int *xzoom, int *yzoom);
+FB_EXPORT extern int fb_sim_cursor(struct fb *ifp, int mode, int x, int y);
+FB_EXPORT extern int fb_sim_getcursor(struct fb *ifp, int *mode, int *x, int 
*y);
+
+
+
 __END_DECLS
 
 /************************************************/

Modified: brlcad/branches/dm-fb-merge/src/libdm/fb_generic.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/fb_generic.c  2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/fb_generic.c  2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -49,7 +49,7 @@
 #include "bu/exit.h"
 
 #include "vmath.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "dm.h"
 
 /**

Modified: brlcad/branches/dm-fb-merge/src/libdm/fb_obj.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/fb_obj.c      2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/fb_obj.c      2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -42,7 +42,7 @@
 #include "bu/getopt.h"
 #include "bu/malloc.h"
 #include "bu/str.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "dm.h"
 
 /* defined in libfb/tcl.c */

Modified: brlcad/branches/dm-fb-merge/src/libdm/fb_paged_io.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/fb_paged_io.c 2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/fb_paged_io.c 2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -33,7 +33,7 @@
 
 #include "bu/color.h"
 #include "bu/log.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "dm.h"
 
 

Deleted: brlcad/branches/dm-fb-merge/src/libdm/fb_private.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/fb_private.h  2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/fb_private.h  2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -1,152 +0,0 @@
-/*                   F B _ P R I V A T E . H
- * BRL-CAD
- *
- * Copyright (c) 2008-2020 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file fb_private.h
- *
- * Private header for libfb.
- *
- */
-
-#ifndef LIBFB_FB_PRIVATE_H
-#define LIBFB_FB_PRIVATE_H
-
-#include "common.h"
-
-#include <limits.h> /* For INT_MAX */
-#include <stdlib.h>
-
-#include "dm.h"
-#include "./include/calltable.h"
-
-/* declare all the possible interfaces */
-#ifdef IF_X
-FB_EXPORT extern struct fb X24_interface;
-#endif
-#ifdef IF_OGL
-FB_EXPORT extern struct fb ogl_interface;
-#endif
-#ifdef IF_OSGL
-FB_EXPORT extern struct fb osgl_interface;
-#endif
-#ifdef IF_WGL
-FB_EXPORT extern struct fb wgl_interface;
-#endif
-#ifdef IF_TK
-FB_EXPORT extern struct fb tk_interface;
-#endif
-#ifdef IF_QT
-FB_EXPORT extern struct fb qt_interface;
-#endif
-#ifdef IF_REMOTE
-FB_EXPORT extern struct fb remote_interface; /* not in list[] */
-#endif
-
-/* Always included */
-FB_EXPORT extern struct fb debug_interface, disk_interface, stk_interface;
-FB_EXPORT extern struct fb memory_interface, fb_null_interface;
-
-
-/* Shared memory (shmget et. al.) key common to multiple framebuffers */
-#define SHMEM_KEY 42
-
-/* Maximum memory buffer allocation.
- *
- * Care must be taken as this can result in a large default memory
- * allocation that can have an impact on performance or minimum system
- * requirements.  For example, 20*1024 results in a 20480x20480 buffer
- * and a 1.6GB allocation.  Using 32*1024 results in a 4GB allocation.
- */
-#define FB_XMAXSCREEN 20*1024 /* 1.6GB */
-#define FB_YMAXSCREEN 20*1024 /* 1.6GB */
-
-/* setting to 1 turns on general intrface debugging for all fb types */
-#define FB_DEBUG 0
-
-
-__BEGIN_DECLS
-
-/*
- * Structure of color map in shared memory region.  Has exactly the
- * same format as the SGI hardware "gammaramp" map Note that only the
- * lower 8 bits are significant.
- */
-struct fb_cmap {
-    short cmr[256];
-    short cmg[256];
-    short cmb[256];
-};
-
-
-/*
- * This defines the format of the in-memory framebuffer copy.  The
- * alpha component and reverse order are maintained for compatibility
- * with /dev/sgi
- */
-struct fb_pixel {
-    unsigned char blue;
-    unsigned char green;
-    unsigned char red;
-    unsigned char alpha;
-};
-
-
-/* Clipping structure for zoom/pan operations */
-struct fb_clip {
-    int xpixmin;       /* view clipping planes clipped to pixel memory space*/
-    int xpixmax;
-    int ypixmin;
-    int ypixmax;
-    int xscrmin;       /* view clipping planes */
-    int xscrmax;
-    int yscrmin;
-    int yscrmax;
-    double oleft;      /* glOrtho parameters */
-    double oright;
-    double otop;
-    double obottom;
-};
-
-/*
- * Some functions and variables we couldn't hide.
- * Not for general consumption.
- */
-FB_EXPORT extern int _fb_disk_enable;
-FB_EXPORT extern int fb_sim_readrect(struct fb *ifp, int xmin, int ymin, int 
_width, int _height, unsigned char *pp);
-FB_EXPORT extern int fb_sim_writerect(struct fb *ifp, int xmin, int ymin, int 
_width, int _height, const unsigned char *pp);
-FB_EXPORT extern int fb_sim_bwreadrect(struct fb *ifp, int xmin, int ymin, int 
_width, int _height, unsigned char *pp);
-FB_EXPORT extern int fb_sim_bwwriterect(struct fb *ifp, int xmin, int ymin, 
int _width, int _height, const unsigned char *pp);
-FB_EXPORT extern int fb_sim_view(struct fb *ifp, int xcenter, int ycenter, int 
xzoom, int yzoom);
-FB_EXPORT extern int fb_sim_getview(struct fb *ifp, int *xcenter, int 
*ycenter, int *xzoom, int *yzoom);
-FB_EXPORT extern int fb_sim_cursor(struct fb *ifp, int mode, int x, int y);
-FB_EXPORT extern int fb_sim_getcursor(struct fb *ifp, int *mode, int *x, int 
*y);
-
-__END_DECLS
-
-#endif /* LIBFB_FB_PRIVATE_H */
-
-/** @} */
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */

Modified: brlcad/branches/dm-fb-merge/src/libdm/fb_rect.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/fb_rect.c     2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/fb_rect.c     2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -33,7 +33,7 @@
 
 #include "bu/color.h"
 #include "bu/log.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "dm.h"
 
 

Modified: brlcad/branches/dm-fb-merge/src/libdm/fb_util.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/fb_util.c     2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/fb_util.c     2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 
-#include "fb_private.h"
+#include "dm_private.h"
 #include "dm.h"
 
 

Modified: brlcad/branches/dm-fb-merge/src/libdm/fbserv_obj.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/fbserv_obj.c  2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/fbserv_obj.c  2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -40,7 +40,7 @@
 #include "dm.h"
 
 #include "dm.h"
-#include "fb_private.h"
+#include "dm_private.h"
 
 
 static struct fb *curr_fbp;            /* current framebuffer pointer */

Modified: brlcad/branches/dm-fb-merge/src/libdm/glx/if_ogl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/glx/if_ogl.c  2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/if_ogl.c  2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -81,7 +81,7 @@
 #include "bu/parallel.h"
 #include "bu/snooze.h"
 #include "bu/str.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "dm.h"
 #include "./fb_ogl.h"
 

Modified: brlcad/branches/dm-fb-merge/src/libdm/if_disk.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/if_disk.c     2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/if_disk.c     2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -31,7 +31,7 @@
 #include "bu/log.h"
 #include "bu/str.h"
 #include "bu/log.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "dm.h"
 
 

Modified: brlcad/branches/dm-fb-merge/src/libdm/if_mem.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/if_mem.c      2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/if_mem.c      2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -37,7 +37,7 @@
 #include "bu/log.h"
 #include "bu/str.h"
 #include "bu/log.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "dm.h"
 
 

Modified: brlcad/branches/dm-fb-merge/src/libdm/if_remote.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/if_remote.c   2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/if_remote.c   2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -52,7 +52,7 @@
 #include "bu/str.h"
 #include "bu/log.h"
 #include "pkg.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "dm.h"
 
 

Modified: brlcad/branches/dm-fb-merge/src/libdm/if_stack.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/if_stack.c    2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/if_stack.c    2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -35,7 +35,7 @@
 #include "bu/log.h"
 #include "bu/str.h"
 #include "bu/log.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "dm.h"
 
 

Modified: brlcad/branches/dm-fb-merge/src/libdm/null/if_null.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/null/if_null.c        2020-04-16 
21:19:14 UTC (rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/null/if_null.c        2020-04-17 
12:46:38 UTC (rev 75430)
@@ -33,7 +33,7 @@
 #include <stdio.h>
 
 #include "bu/log.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "dm.h"
 
 

Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp      2020-04-16 
21:19:14 UTC (rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp      2020-04-17 
12:46:38 UTC (rev 75430)
@@ -45,7 +45,7 @@
 
 #include "./fb_osgl.h"
 extern "C" {
-#include "fb_private.h"
+#include "dm_private.h"
 }
 
 #define DIRECT_COLOR_VISUAL_ALLOWED 0

Modified: brlcad/branches/dm-fb-merge/src/libdm/qt/if_qt.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/qt/if_qt.cpp  2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/if_qt.cpp  2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -35,7 +35,7 @@
 #include <ctype.h>
 
 #include "dm.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "./fb_qt.h"
 #include "bu/malloc.h"
 #include "bu/file.h"

Modified: brlcad/branches/dm-fb-merge/src/libdm/tcl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/tcl.c 2020-04-16 21:19:14 UTC (rev 
75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/tcl.c 2020-04-17 12:46:38 UTC (rev 
75430)
@@ -41,7 +41,7 @@
 #include "bu/cmd.h"
 #include "bu/log.h"
 #include "bu/vls.h"
-#include "fb_private.h"
+#include "dm_private.h"
 /* private headers */
 #include "brlcad_version.h"
 

Modified: brlcad/branches/dm-fb-merge/src/libdm/tk/if_tk.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/tk/if_tk.c    2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/if_tk.c    2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -43,7 +43,7 @@
 #include "bu/log.h"
 #include "bu/snooze.h"
 
-#include "fb_private.h"
+#include "dm_private.h"
 #include "dm.h"
 
 

Modified: brlcad/branches/dm-fb-merge/src/libdm/txt/if_debug.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/txt/if_debug.c        2020-04-16 
21:19:14 UTC (rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/txt/if_debug.c        2020-04-17 
12:46:38 UTC (rev 75430)
@@ -33,7 +33,7 @@
 
 #include "bu/color.h"
 #include "bu/log.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "dm.h"
 
 

Modified: brlcad/branches/dm-fb-merge/src/libdm/wgl/if_wgl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/wgl/if_wgl.c  2020-04-16 21:19:14 UTC 
(rev 75429)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/if_wgl.c  2020-04-17 12:46:38 UTC 
(rev 75430)
@@ -60,7 +60,7 @@
 #include "rt/geom.h"
 #include "raytrace.h"
 #include "dm.h"
-#include "fb_private.h"
+#include "dm_private.h"
 #include "./fb_wgl.h"
 
 

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

Reply via email to