Revision: 55545
http://sourceforge.net/p/brlcad/code/55545
Author: brlcad
Date: 2013-05-23 03:41:40 +0000 (Thu, 23 May 2013)
Log Message:
-----------
quell redefinition error for openindiana
Modified Paths:
--------------
brlcad/trunk/src/libfb/if_mem.c
Modified: brlcad/trunk/src/libfb/if_mem.c
===================================================================
--- brlcad/trunk/src/libfb/if_mem.c 2013-05-23 03:33:50 UTC (rev 55544)
+++ brlcad/trunk/src/libfb/if_mem.c 2013-05-23 03:41:40 UTC (rev 55545)
@@ -37,7 +37,7 @@
/* Per connection private info */
-struct meminfo {
+struct mem_info {
FBIO *fbp; /* attached frame buffer (if any) */
unsigned char *mem; /* memory frame buffer */
ColorMap cmap; /* color map buffer */
@@ -45,7 +45,7 @@
int cmap_dirty; /* !0 implies unflushed written cmap */
int write_thru; /* !0 implies pass-thru write mode */
};
-#define MI(ptr) ((struct meminfo *)((ptr)->u1.p))
+#define MI(ptr) ((struct mem_info *)((ptr)->u1.p))
#define MIL(ptr) ((ptr)->u1.p) /* left hand side version */
#define MODE_1MASK (1<<1)
@@ -127,8 +127,8 @@
}
/* build a local static info struct */
- if ((MIL(ifp) = (char *)calloc(1, sizeof(struct meminfo))) == NULL) {
- fb_log("mem_open: meminfo malloc failed\n");
+ if ((MIL(ifp) = (char *)calloc(1, sizeof(struct mem_info))) == NULL) {
+ fb_log("mem_open: mem_info malloc failed\n");
return -1;
}
cp = &file[strlen("/dev/mem")];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
