Revision: 70031
http://sourceforge.net/p/brlcad/code/70031
Author: starseeker
Date: 2017-07-31 15:26:13 +0000 (Mon, 31 Jul 2017)
Log Message:
-----------
avoid conflict
Modified Paths:
--------------
brlcad/trunk/src/external/Unigraphics/conv.h
brlcad/trunk/src/external/Unigraphics/ug-g.c
brlcad/trunk/src/external/Unigraphics/ug_misc.c
Modified: brlcad/trunk/src/external/Unigraphics/conv.h
===================================================================
--- brlcad/trunk/src/external/Unigraphics/conv.h 2017-07-31 02:18:06 UTC
(rev 70030)
+++ brlcad/trunk/src/external/Unigraphics/conv.h 2017-07-31 15:26:13 UTC
(rev 70031)
@@ -45,7 +45,7 @@
extern ug_tol ugtol;
extern int debug;
-#define dprintf if (debug) printf
+#define ugdprintf if (debug) printf
#endif /* EXTERNAL_UNIGRAPHICS_CONV_H */
Modified: brlcad/trunk/src/external/Unigraphics/ug-g.c
===================================================================
--- brlcad/trunk/src/external/Unigraphics/ug-g.c 2017-07-31 02:18:06 UTC
(rev 70030)
+++ brlcad/trunk/src/external/Unigraphics/ug-g.c 2017-07-31 15:26:13 UTC
(rev 70031)
@@ -5447,7 +5447,7 @@
if (ugpart) UF_PART_close(ugpart, 1, 1);
cset = ugpart = 0;
- dprintf("%s closed\n", av[i]);
+ ugdprintf("%s closed\n", av[i]);
UF_terminate();
Modified: brlcad/trunk/src/external/Unigraphics/ug_misc.c
===================================================================
--- brlcad/trunk/src/external/Unigraphics/ug_misc.c 2017-07-31 02:18:06 UTC
(rev 70030)
+++ brlcad/trunk/src/external/Unigraphics/ug_misc.c 2017-07-31 15:26:13 UTC
(rev 70031)
@@ -163,13 +163,13 @@
UF_func(UF_PART_open(p_name, &ugpart, &error_status));
if (error_status.n_parts > 0) {
- dprintf("%*sPART_open status: failed:%d user_abort:%d n_parts:%d\n",
+ ugdprintf("%*sPART_open status: failed:%d user_abort:%d n_parts:%d\n",
level, "",
error_status.failed,
error_status.user_abort,
error_status.n_parts);
for (e_part = 0; e_part < error_status.n_parts; e_part++) {
- dprintf("%*sPart %s status %d\n",
+ ugdprintf("%*sPart %s status %d\n",
level, "",
error_status.file_names[e_part],
error_status.statuses[e_part]);
@@ -260,13 +260,13 @@
if (error_status.n_parts > 0) {
- dprintf("%*sPART_open status: failed:%d user_abort:%d n_parts:%d\n",
+ ugdprintf("%*sPART_open status: failed:%d user_abort:%d n_parts:%d\n",
level, "",
error_status.failed,
error_status.user_abort,
error_status.n_parts);
for (e_part = 0; e_part < error_status.n_parts; e_part++) {
- dprintf("%*sPart %s status %d\n",
+ ugdprintf("%*sPart %s status %d\n",
level, "",
error_status.file_names[e_part],
error_status.statuses[e_part]);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
