Revision: 44898
http://brlcad.svn.sourceforge.net/brlcad/?rev=44898&view=rev
Author: brlcad
Date: 2011-06-11 01:23:26 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
remaining removal of BU_ARGS. poof.
Modified Paths:
--------------
brlcad/trunk/include/bu.h
brlcad/trunk/include/dm.h
brlcad/trunk/include/raytrace.h
brlcad/trunk/src/libdm/dm-X.c
brlcad/trunk/src/libdm/dm-ogl.c
brlcad/trunk/src/libdm/dm-plot.c
brlcad/trunk/src/libdm/dm-ps.c
brlcad/trunk/src/libdm/dm-rtgl.c
brlcad/trunk/src/libdm/dm-tk.c
brlcad/trunk/src/libdm/dm-wgl.c
brlcad/trunk/src/librt/bundle.c
brlcad/trunk/src/rttherm/ssampview.c
Modified: brlcad/trunk/include/bu.h
===================================================================
--- brlcad/trunk/include/bu.h 2011-06-11 01:06:42 UTC (rev 44897)
+++ brlcad/trunk/include/bu.h 2011-06-11 01:23:26 UTC (rev 44898)
@@ -138,7 +138,6 @@
* argument list given for "args" be enclosed in parens.
*/
#define BU_EXTERN(type_and_name, args) extern type_and_name args
-#define BU_ARGS(args) args
/**
* shorthand declaration of a printf-style functions
@@ -1532,7 +1531,7 @@
/*----------------------------------------------------------------------*/
/* formerly rt_g.rtg_logindent, now use bu_log_indent_delta() */
-typedef int (*bu_hook_t)BU_ARGS((genptr_t, genptr_t));
+typedef int (*bu_hook_t)(genptr_t, genptr_t);
struct bu_hook_list {
struct bu_list l; /**< @brief linked list */
@@ -3609,7 +3608,7 @@
* on. The registers are not shared.
*/
BU_EXPORT BU_EXTERN(void bu_parallel,
- (void (*func)BU_ARGS((int ncpu, genptr_t arg)),
+ (void (*func)(int ncpu, genptr_t arg),
int ncpu,
genptr_t arg));
Modified: brlcad/trunk/include/dm.h
===================================================================
--- brlcad/trunk/include/dm.h 2011-06-11 01:06:42 UTC (rev 44897)
+++ brlcad/trunk/include/dm.h 2011-06-11 01:23:26 UTC (rev 44898)
@@ -231,7 +231,7 @@
int (*dm_drawPoint2D)();
int (*dm_drawVList)();
int (*dm_drawVListHiddenLine)();
- int (*dm_draw)(struct dm *dmp, struct bn_vlist
*(*callback_function)BU_ARGS((void *)), genptr_t *data); /**< @brief
formerly dmr_object */
+ int (*dm_draw)(struct dm *dmp, struct bn_vlist *(*callback_function)(void
*), genptr_t *data); /**< @brief formerly dmr_object */
int (*dm_setFGColor)(struct dm *dmp, unsigned char r, unsigned char g,
unsigned char b, int strict, fastf_t transparency);
int (*dm_setBGColor)(struct dm *, unsigned char, unsigned char, unsigned
char);
int (*dm_setLineAttr)(); /**< @brief currently - linewidth, (not-)dashed
*/
@@ -460,7 +460,7 @@
HIDDEN int _dmtype##_drawLines3D(struct dm *dmp, int npoints, point_t
*points); \
HIDDEN int _dmtype##_drawPoint2D(struct dm *dmp, fastf_t x, fastf_t y); \
HIDDEN int _dmtype##_drawVList(struct dm *dmp, struct bn_vlist *vp); \
- HIDDEN int _dmtype##_draw(struct dm *dmp, struct bn_vlist
*(*callback_function)BU_ARGS((void *)), genptr_t *data); \
+ HIDDEN int _dmtype##_draw(struct dm *dmp, struct bn_vlist
*(*callback_function)(void *), genptr_t *data); \
HIDDEN int _dmtype##_setFGColor(struct dm *dmp, unsigned char r, unsigned
char g, unsigned char b, int strict, fastf_t transparency); \
HIDDEN int _dmtype##_setBGColor(struct dm *dmp, unsigned char r, unsigned
char g, unsigned char b); \
HIDDEN int _dmtype##_setLineAttr(struct dm *dmp, int width, int style); \
Modified: brlcad/trunk/include/raytrace.h
===================================================================
--- brlcad/trunk/include/raytrace.h 2011-06-11 01:06:42 UTC (rev 44897)
+++ brlcad/trunk/include/raytrace.h 2011-06-11 01:23:26 UTC (rev 44898)
@@ -1583,17 +1583,17 @@
unsigned long a_magic;
/* THESE ELEMENTS ARE MANDATORY */
struct xray a_ray; /**< @brief Actual ray to be
shot */
- int (*a_hit)BU_ARGS((struct application *, struct
partition *, struct seg *)); /**< @brief called when shot hits model */
- int (*a_miss)BU_ARGS((struct application *));
/**< @brief called when shot misses */
+ int (*a_hit)(struct application *, struct partition
*, struct seg *); /**< @brief called when shot hits model */
+ int (*a_miss)(struct application *); /**<
@brief called when shot misses */
int a_onehit; /**< @brief flag to stop on
first hit */
fastf_t a_ray_length; /**< @brief distance from ray start to
end intersections */
struct rt_i * a_rt_i; /**< @brief this librt
instance */
int a_zero1; /**< @brief must be zero
(sanity check) */
/* THESE ELEMENTS ARE USED BY THE LIBRARY, BUT MAY BE LEFT ZERO */
struct resource * a_resource; /**< @brief dynamic memory resources */
- int (*a_overlap)BU_ARGS((struct application *,
struct partition *, struct region *, struct region *, struct partition *));
/**< @brief DEPRECATED */
- void (*a_multioverlap)BU_ARGS((struct application *, struct
partition *, struct bu_ptbl *, struct partition *)); /**< @brief called to
resolve overlaps */
- void (*a_logoverlap)BU_ARGS((struct application *, const
struct partition *, const struct bu_ptbl *, const struct partition *));
/**< @brief called to log overlaps */
+ int (*a_overlap)(struct application *, struct
partition *, struct region *, struct region *, struct partition *); /**<
@brief DEPRECATED */
+ void (*a_multioverlap)(struct application *, struct
partition *, struct bu_ptbl *, struct partition *); /**< @brief called to
resolve overlaps */
+ void (*a_logoverlap)(struct application *, const struct
partition *, const struct bu_ptbl *, const struct partition *); /**<
@brief called to log overlaps */
int a_level; /**< @brief recursion level
(for printing) */
int a_x; /**< @brief Screen X of ray,
if applicable */
int a_y; /**< @brief Screen Y of ray,
if applicable */
@@ -1662,8 +1662,8 @@
/* THESE ELEMENTS ARE MANDATORY */
struct xrays b_rays; /**< @brief Actual bundle of rays to be shot */
struct application b_ap; /**< @brief application setting to be applied to
each ray */
- int (*b_hit)BU_ARGS((struct application_bundle *, struct partition_bundle
*)); /**< @brief called when bundle hits model */
- int (*b_miss)BU_ARGS((struct application_bundle *)); /**< @brief called
when entire bundle misses */
+ int (*b_hit)(struct application_bundle *, struct partition_bundle *); /**<
@brief called when bundle hits model */
+ int (*b_miss)(struct application_bundle *); /**< @brief called when
entire bundle misses */
int b_user; /**< @brief application_bundle-specific value */
genptr_t b_uptr; /**< @brief application_bundle-specific pointer */
int b_return;
@@ -3127,12 +3127,12 @@
/* read db (to build directory) */
RT_EXPORT BU_EXTERN(int db_scan,
(struct db_i *,
- int (*handler)BU_ARGS((struct db_i *,
+ int (*handler)(struct db_i *,
const char *name,
off_t addr,
size_t nrec,
int flags,
- genptr_t client_data)),
+ genptr_t client_data),
int do_old_matter,
genptr_t client_data));
/* update db unit conversions */
Modified: brlcad/trunk/src/libdm/dm-X.c
===================================================================
--- brlcad/trunk/src/libdm/dm-X.c 2011-06-11 01:06:42 UTC (rev 44897)
+++ brlcad/trunk/src/libdm/dm-X.c 2011-06-11 01:23:26 UTC (rev 44898)
@@ -1098,7 +1098,7 @@
*
*/
HIDDEN int
-X_draw(struct dm *dmp, struct bn_vlist *(*callback_function)BU_ARGS((void *)),
genptr_t *data)
+X_draw(struct dm *dmp, struct bn_vlist *(*callback_function)(void *), genptr_t
*data)
{
struct bn_vlist *vp;
if (!callback_function) {
Modified: brlcad/trunk/src/libdm/dm-ogl.c
===================================================================
--- brlcad/trunk/src/libdm/dm-ogl.c 2011-06-11 01:06:42 UTC (rev 44897)
+++ brlcad/trunk/src/libdm/dm-ogl.c 2011-06-11 01:23:26 UTC (rev 44898)
@@ -111,7 +111,7 @@
HIDDEN int ogl_drawPoint2D(struct dm *dmp, fastf_t x, fastf_t y);
HIDDEN int ogl_drawVList(struct dm *dmp, register struct bn_vlist *vp);
HIDDEN int ogl_drawVListHiddenLine(struct dm *dmp, register struct bn_vlist
*vp);
-HIDDEN int ogl_draw(struct dm *dmp, struct bn_vlist
*(*callback_function)BU_ARGS((void *)), genptr_t *data);
+HIDDEN int ogl_draw(struct dm *dmp, struct bn_vlist *(*callback_function)(void
*), genptr_t *data);
HIDDEN int ogl_setFGColor(struct dm *dmp, unsigned char r, unsigned char g,
unsigned char b, int strict, fastf_t transparency);
HIDDEN int ogl_setBGColor(struct dm *dmp, unsigned char r, unsigned char g,
unsigned char b);
HIDDEN int ogl_setLineAttr(struct dm *dmp, int width, int style);
@@ -1653,7 +1653,7 @@
*
*/
HIDDEN int
-ogl_draw(struct dm *dmp, struct bn_vlist *(*callback_function)BU_ARGS((void
*)), genptr_t *data)
+ogl_draw(struct dm *dmp, struct bn_vlist *(*callback_function)(void *),
genptr_t *data)
{
struct bn_vlist *vp;
if (!callback_function) {
Modified: brlcad/trunk/src/libdm/dm-plot.c
===================================================================
--- brlcad/trunk/src/libdm/dm-plot.c 2011-06-11 01:06:42 UTC (rev 44897)
+++ brlcad/trunk/src/libdm/dm-plot.c 2011-06-11 01:23:26 UTC (rev 44898)
@@ -309,7 +309,7 @@
* P L O T _ D R A W
*/
HIDDEN int
-plot_draw(struct dm *dmp, struct bn_vlist *(*callback_function)BU_ARGS((void
*)), genptr_t *data)
+plot_draw(struct dm *dmp, struct bn_vlist *(*callback_function)(void *),
genptr_t *data)
{
struct bn_vlist *vp;
if (!callback_function) {
Modified: brlcad/trunk/src/libdm/dm-ps.c
===================================================================
--- brlcad/trunk/src/libdm/dm-ps.c 2011-06-11 01:06:42 UTC (rev 44897)
+++ brlcad/trunk/src/libdm/dm-ps.c 2011-06-11 01:23:26 UTC (rev 44898)
@@ -296,7 +296,7 @@
*/
/* ARGSUSED */
HIDDEN int
-ps_draw(struct dm *dmp, struct bn_vlist *(*callback_function)BU_ARGS((void
*)), genptr_t *data)
+ps_draw(struct dm *dmp, struct bn_vlist *(*callback_function)(void *),
genptr_t *data)
{
struct bn_vlist *vp;
if (!callback_function) {
Modified: brlcad/trunk/src/libdm/dm-rtgl.c
===================================================================
--- brlcad/trunk/src/libdm/dm-rtgl.c 2011-06-11 01:06:42 UTC (rev 44897)
+++ brlcad/trunk/src/libdm/dm-rtgl.c 2011-06-11 01:23:26 UTC (rev 44898)
@@ -1959,7 +1959,7 @@
*
*/
HIDDEN int
-rtgl_draw(struct dm *dmp, struct bn_vlist *(*callback_function)BU_ARGS((void
*)), genptr_t *data)
+rtgl_draw(struct dm *dmp, struct bn_vlist *(*callback_function)(void *),
genptr_t *data)
{
struct bn_vlist *vp;
if (!callback_function) {
Modified: brlcad/trunk/src/libdm/dm-tk.c
===================================================================
--- brlcad/trunk/src/libdm/dm-tk.c 2011-06-11 01:06:42 UTC (rev 44897)
+++ brlcad/trunk/src/libdm/dm-tk.c 2011-06-11 01:23:26 UTC (rev 44898)
@@ -443,7 +443,7 @@
* T K _ D R A W
*/
int
-tk_draw(struct dm *dmp, struct bn_vlist *(*callback_function)BU_ARGS((void
*)), genptr_t *data)
+tk_draw(struct dm *dmp, struct bn_vlist *(*callback_function)(void *),
genptr_t *data)
{
struct bn_vlist *vp;
if (!callback_function) {
Modified: brlcad/trunk/src/libdm/dm-wgl.c
===================================================================
--- brlcad/trunk/src/libdm/dm-wgl.c 2011-06-11 01:06:42 UTC (rev 44897)
+++ brlcad/trunk/src/libdm/dm-wgl.c 2011-06-11 01:23:26 UTC (rev 44898)
@@ -1188,7 +1188,7 @@
*
*/
HIDDEN int
-wgl_draw(struct dm *dmp, struct bn_vlist *(*callback_function)BU_ARGS((void
*)), genptr_t *data)
+wgl_draw(struct dm *dmp, struct bn_vlist *(*callback_function)(void *),
genptr_t *data)
{
struct bn_vlist *vp;
if (!callback_function) {
Modified: brlcad/trunk/src/librt/bundle.c
===================================================================
--- brlcad/trunk/src/librt/bundle.c 2011-06-11 01:06:42 UTC (rev 44897)
+++ brlcad/trunk/src/librt/bundle.c 2011-06-11 01:23:26 UTC (rev 44898)
@@ -583,8 +583,8 @@
struct partition_bundle *pb = NULL;
genptr_t a_uptr_backup = NULL;
struct xray a_ray;
- int (*a_hit)BU_ARGS((struct application *, struct partition *, struct seg
*));
- int (*a_miss)BU_ARGS((struct application *));
+ int (*a_hit)(struct application *, struct partition *, struct seg *);
+ int (*a_miss)(struct application *);
struct application *ray_ap = NULL;
int hit;
Modified: brlcad/trunk/src/rttherm/ssampview.c
===================================================================
--- brlcad/trunk/src/rttherm/ssampview.c 2011-06-11 01:06:42 UTC (rev
44897)
+++ brlcad/trunk/src/rttherm/ssampview.c 2011-06-11 01:23:26 UTC (rev
44898)
@@ -95,8 +95,8 @@
int doit(ClientData cd, Tcl_Interp *interp, int argc, char **argv),
doit1(ClientData cd, Tcl_Interp *interp, int argc, char **argv);
void find_minmax(void);
-void rescale(BU_ARGS(int wav));
-void show_color(BU_ARGS(int off));
+void rescale(int wav);
+void show_color(int off);
char *first_command = "no_command?";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
