Revision: 57091
http://sourceforge.net/p/brlcad/code/57091
Author: brlcad
Date: 2013-08-23 04:36:51 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
eliminate WDB_EXTERN. we no longer support k&r style declarations.
Modified Paths:
--------------
brlcad/trunk/include/wdb.h
Modified: brlcad/trunk/include/wdb.h
===================================================================
--- brlcad/trunk/include/wdb.h 2013-08-23 04:35:25 UTC (rev 57090)
+++ brlcad/trunk/include/wdb.h 2013-08-23 04:36:51 UTC (rev 57091)
@@ -64,7 +64,6 @@
* It is vital that the argument list given for "args" be enclosed
* in parentheses.
*/
-#define WDB_EXTERN(type_and_name, args) extern type_and_name args
#define WDB_ARGS(args) args
/*
@@ -113,7 +112,7 @@
*
* Make a database header (ID) record.
*/
-WDB_EXPORT WDB_EXTERN(int mk_id, (struct rt_wdb *fp, const char *title) );
+WDB_EXPORT extern int mk_id(struct rt_wdb *fp, const char *title);
/**
*
@@ -124,7 +123,7 @@
* <0 error
* 0 success
*/
-WDB_EXPORT WDB_EXTERN(int mk_id_units, (struct rt_wdb *fp, const char *title,
const char *units) );
+WDB_EXPORT extern int mk_id_units(struct rt_wdb *fp, const char *title, const
char *units);
/**
@@ -185,7 +184,7 @@
* pointing normal vector.
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_half, (struct rt_wdb *fp, const char *name, const
vect_t norm, fastf_t d) );
+WDB_EXPORT extern int mk_half(struct rt_wdb *fp, const char *name, const
vect_t norm, fastf_t d);
/**
*
@@ -198,15 +197,14 @@
const char *name,
const point_t center,
const vect_t normal,
- const fastf_t magnitude );
+ const fastf_t magnitude);
/**
*
* Make a right parallelepiped. Specified by minXYZ, maxXYZ.
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_rpp, (struct rt_wdb *fp, const char *name, const
point_t min,
- const point_t max) );
+WDB_EXPORT extern int mk_rpp(struct rt_wdb *fp, const char *name, const
point_t min, const point_t max);
/**
*
@@ -216,18 +214,18 @@
* cross z.
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_wedge, (struct rt_wdb *fp, const char *name,
const point_t vert,
- const vect_t xdirv, const vect_t zdirv,
- fastf_t xlen, fastf_t ylen, fastf_t zlen,
- fastf_t x_top_len) );
+WDB_EXPORT extern int mk_wedge(struct rt_wdb *fp, const char *name, const
point_t vert,
+ const vect_t xdirv, const vect_t zdirv,
+ fastf_t xlen, fastf_t ylen, fastf_t zlen,
+ fastf_t x_top_len);
-WDB_EXPORT WDB_EXTERN(int mk_arb4, (struct rt_wdb *fp, const char *name, const
fastf_t *pts4) );
+WDB_EXPORT extern int mk_arb4(struct rt_wdb *fp, const char *name, const
fastf_t *pts4);
-WDB_EXPORT WDB_EXTERN(int mk_arb5, (struct rt_wdb *fp, const char *name, const
fastf_t *pts5) );
+WDB_EXPORT extern int mk_arb5(struct rt_wdb *fp, const char *name, const
fastf_t *pts5);
-WDB_EXPORT WDB_EXTERN(int mk_arb6, (struct rt_wdb *fp, const char *name, const
fastf_t *pts6) );
+WDB_EXPORT extern int mk_arb6(struct rt_wdb *fp, const char *name, const
fastf_t *pts6);
-WDB_EXPORT WDB_EXTERN(int mk_arb7, (struct rt_wdb *fp, const char *name, const
fastf_t *pts7) );
+WDB_EXPORT extern int mk_arb7(struct rt_wdb *fp, const char *name, const
fastf_t *pts7);
/**
*
@@ -239,15 +237,15 @@
* plate.
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_arb8, (struct rt_wdb *fp, const char *name, const
fastf_t *pts8) );
+WDB_EXPORT extern int mk_arb8(struct rt_wdb *fp, const char *name, const
fastf_t *pts8);
/**
*
* Make a sphere with the given center point and radius.
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_sph, (struct rt_wdb *fp, const char *name, const
point_t center,
- fastf_t radius) );
+WDB_EXPORT extern int mk_sph(struct rt_wdb *fp, const char *name, const
point_t center,
+ fastf_t radius);
/**
*
@@ -256,8 +254,8 @@
* relative lengths of the three radius vectors.
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_ell, (struct rt_wdb *fp, const char *name, const
point_t center,
- const vect_t a, const vect_t b, const vect_t
c) );
+WDB_EXPORT extern int mk_ell(struct rt_wdb *fp, const char *name, const
point_t center,
+ const vect_t a, const vect_t b, const vect_t c);
/**
*
@@ -265,25 +263,25 @@
* point to center of solid part, r2: radius of solid part.
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_tor, (struct rt_wdb *fp, const char *name, const
point_t center,
- const vect_t inorm, double r1, double r2) );
+WDB_EXPORT extern int mk_tor(struct rt_wdb *fp, const char *name, const
point_t center,
+ const vect_t inorm, double r1, double r2);
/**
*
* Make a Right Circular Cylinder (special case of the TGC).
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_rcc, (struct rt_wdb *fp, const char *name, const
point_t base,
- const vect_t height, fastf_t radius) );
+WDB_EXPORT extern int mk_rcc(struct rt_wdb *fp, const char *name, const
point_t base,
+ const vect_t height, fastf_t radius);
/**
*
* Make a Truncated General Cylinder.
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_tgc, (struct rt_wdb *fp, const char *name, const
point_t base,
- const vect_t height, const vect_t a, const
vect_t b,
- const vect_t c, const vect_t d) );
+WDB_EXPORT extern int mk_tgc(struct rt_wdb *fp, const char *name, const
point_t base,
+ const vect_t height, const vect_t a, const vect_t
b,
+ const vect_t c, const vect_t d);
/**
*
@@ -292,9 +290,9 @@
* end of the cone.
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_cone, (struct rt_wdb *fp, const char *name, const
point_t base,
- const vect_t dirv, fastf_t height, fastf_t
rad1,
- fastf_t rad2) );
+WDB_EXPORT extern int mk_cone(struct rt_wdb *fp, const char *name, const
point_t base,
+ const vect_t dirv, fastf_t height, fastf_t rad1,
+ fastf_t rad2);
/**
*
@@ -303,16 +301,16 @@
* name with different calling sequence.
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_trc_h, (struct rt_wdb *fp, const char *name,
const point_t base,
- const vect_t height, fastf_t radbase,
fastf_t radtop) );
+WDB_EXPORT extern int mk_trc_h(struct rt_wdb *fp, const char *name, const
point_t base,
+ const vect_t height, fastf_t radbase, fastf_t
radtop);
/**
*
* Convenience wrapper for mk_trc_h().
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_trc_top, (struct rt_wdb *fp, const char *name,
const point_t ibase,
- const point_t itop, fastf_t radbase,
fastf_t radtop) );
+WDB_EXPORT extern int mk_trc_top(struct rt_wdb *fp, const char *name, const
point_t ibase,
+ const point_t itop, fastf_t radbase, fastf_t
radtop);
/**
*
@@ -424,9 +422,9 @@
const fastf_t threshold,
const fastf_t *verts[5] ); /* X, Y, Z, fldstr, goo/Beta */
-WDB_EXPORT WDB_EXTERN(int mk_arbn, (struct rt_wdb *fp, const char *name,
size_t neqn, plane_t eqn[]) );
+WDB_EXPORT extern int mk_arbn(struct rt_wdb *fp, const char *name, size_t
neqn, plane_t eqn[]);
-WDB_EXPORT WDB_EXTERN(int mk_ars, (struct rt_wdb *fp, const char *name, size_t
ncurves, size_t pts_per_curve, fastf_t *curves[]) );
+WDB_EXPORT extern int mk_ars(struct rt_wdb *fp, const char *name, size_t
ncurves, size_t pts_per_curve, fastf_t *curves[]);
/**
*
@@ -435,7 +433,7 @@
* wdb_put_internal. Only supported on database version 5 or above
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_constraint, (struct rt_wdb *wdbp, const char
*name, const char *expr));
+WDB_EXPORT extern int mk_constraint(struct rt_wdb *wdbp, const char *name,
const char *expr);
typedef enum {
@@ -495,7 +493,7 @@
* an empty binunif will be created.
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_binunif, (struct rt_wdb *fp, const char *name,
const genptr_t data, wdb_binunif data_type, long count) );
+WDB_EXPORT extern int mk_binunif(struct rt_wdb *fp, const char *name, const
genptr_t data, wdb_binunif data_type, long count);
/*----------------------------------------------------------------------*/
@@ -733,8 +731,8 @@
* <0 failure
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_particle, (struct rt_wdb *fp, const char *name,
point_t vertex,
- vect_t height, double vradius, double
hradius) );
+WDB_EXPORT extern int mk_particle(struct rt_wdb *fp, const char *name, point_t
vertex,
+ vect_t height, double vradius, double
hradius);
/**
*
@@ -746,7 +744,7 @@
* <0 failure
*
*/
-WDB_EXPORT WDB_EXTERN(int mk_pipe, (struct rt_wdb *fp, const char *name,
struct bu_list *headp) );
+WDB_EXPORT extern int mk_pipe(struct rt_wdb *fp, const char *name, struct
bu_list *headp);
/**
*
@@ -777,21 +775,21 @@
/* strsol primitives */
-WDB_EXPORT WDB_EXTERN(int mk_dsp, (struct rt_wdb *fp, const char *name, const
char *file,
- size_t xdim, size_t ydim, const matp_t mat));
+WDB_EXPORT extern int mk_dsp(struct rt_wdb *fp, const char *name, const char
*file,
+ size_t xdim, size_t ydim, const matp_t mat);
-WDB_EXPORT WDB_EXTERN(int mk_ebm, (struct rt_wdb *fp, const char *name, const
char *file,
- size_t xdim, size_t ydim, fastf_t tallness,
const matp_t mat));
+WDB_EXPORT extern int mk_ebm(struct rt_wdb *fp, const char *name, const char
*file,
+ size_t xdim, size_t ydim, fastf_t tallness,
const matp_t mat);
-WDB_EXPORT WDB_EXTERN(int mk_hrt, (struct rt_wdb *fp, const char *name, const
point_t center,
- const vect_t x, const vect_t y, const vect_t
z, const fastf_t dist));
+WDB_EXPORT extern int mk_hrt(struct rt_wdb *fp, const char *name, const
point_t center,
+ const vect_t x, const vect_t y, const vect_t z,
const fastf_t dist);
/**
* M K _ V O L
*/
-WDB_EXPORT WDB_EXTERN(int mk_vol, (struct rt_wdb *fp, const char *name, const
char *file,
- size_t xdim, size_t ydim, size_t zdim,
size_t lo, size_t hi,
- const vect_t cellsize, const matp_t mat));
+WDB_EXPORT extern int mk_vol(struct rt_wdb *fp, const char *name, const char
*file,
+ size_t xdim, size_t ydim, size_t zdim, size_t lo,
size_t hi,
+ const vect_t cellsize, const matp_t mat);
/**
@@ -801,8 +799,8 @@
* object in 'file'. meth is 0 (RT_PART_NUBSPT) or 1
* (RT_PART_NUGRID). method 0 is what is normally used.
*/
-WDB_EXPORT WDB_EXTERN(int mk_submodel, (struct rt_wdb *fp, const char *name,
const char *file,
- const char *treetop, int meth));
+WDB_EXPORT extern int mk_submodel(struct rt_wdb *fp, const char *name, const
char *file,
+ const char *treetop, int meth);
/*----------------------------------------------------------------------*/
@@ -844,11 +842,10 @@
* The caller is responsible for initializing the header structures
* forward and backward links.
*/
-WDB_EXPORT WDB_EXTERN (struct wmember *mk_addmember,
- (const char *name,
- struct bu_list *headp,
- mat_t mat,
- int op));
+WDB_EXPORT extern struct wmember *mk_addmember(const char *name,
+ struct bu_list *headp,
+ mat_t mat,
+ int op);
#define mk_lcomb(_fp, _name, _headp, _rf, _shadername, _shaderargs, _rgb,
_inh) \
mk_comb(_fp, _name, &((_headp)->l), _rf, _shadername, _shaderargs, \
@@ -936,7 +933,7 @@
* -1 error
* 0 OK
*/
-WDB_EXPORT WDB_EXTERN(int mk_conversion, (char *units_string) );
+WDB_EXPORT extern int mk_conversion(char *units_string);
/**
@@ -947,19 +944,19 @@
* -1 error
* 0 OK
*/
-WDB_EXPORT WDB_EXTERN(int mk_set_conversion, (double val) );
+WDB_EXPORT extern int mk_set_conversion(double val);
/**
* This internal variable should not be directly modified;
* call mk_conversion() or mk_set_conversion() instead.
*/
-WDB_EXPORT extern double mk_conv2mm; /**< @brief Conversion
factor to mm */
+WDB_EXPORT extern double mk_conv2mm; /**< @brief Conversion factor
to mm */
/**
* Set this variable to either 4 or 5, depending on which version of
* the database you wish to write.
*/
-WDB_EXPORT extern int mk_version; /**< @brief Which version
database to write */
+WDB_EXPORT extern int mk_version; /**< @brief Which version
database to write */
/*
* Internal routines
@@ -1008,12 +1005,12 @@
* followed by a call to "rt_reprep".
*/
-WDB_EXPORT WDB_EXTERN( int make_hole, ( struct rt_wdb *wdbp,
- point_t hole_start,
- vect_t hole_depth,
- fastf_t hole_radius,
- int num_objs,
- struct directory **dp ) );
+WDB_EXPORT extern int make_hole(struct rt_wdb *wdbp,
+ point_t hole_start,
+ vect_t hole_depth,
+ fastf_t hole_radius,
+ int num_objs,
+ struct directory **dp);
/**
@@ -1037,12 +1034,12 @@
* There is no need to call "rt_unprep" nor "rt_reprep" with this
* routine.
*/
-WDB_EXPORT WDB_EXTERN( int make_hole_in_prepped_regions, ( struct rt_wdb *wdbp,
- struct rt_i *rtip,
- point_t hole_start,
- vect_t hole_depth,
- fastf_t radius,
- struct bu_ptbl
*regions ) );
+WDB_EXPORT extern int make_hole_in_prepped_regions(struct rt_wdb *wdbp,
+ struct rt_i *rtip,
+ point_t hole_start,
+ vect_t hole_depth,
+ fastf_t radius,
+ struct bu_ptbl *regions);
__END_DECLS
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
