[brlcad-commits] SF.net SVN: brlcad:[41049] brlcad/trunk/src/util
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2010-10-18 17:40:04
|
Revision: 41049 http://brlcad.svn.sourceforge.net/brlcad/?rev=41049&view=rev Author: brlcad Date: 2010-10-18 17:39:57 +0000 (Mon, 18 Oct 2010) Log Message: ----------- remove all of the forward declarations for bu_opt* (i.e., bu_optind, bu_optarg, bu_opterr, and bu_getopt()) as including these as extern declarations will break the Windows build (missing BU_EXPORT label needed to import the symbol). the header already declares them, though, so just remove them. there are probably a lot more of these cases. Modified Paths: -------------- brlcad/trunk/src/util/azel.c brlcad/trunk/src/util/dsp_add.c brlcad/trunk/src/util/imgdims.c brlcad/trunk/src/util/orle-pix.c brlcad/trunk/src/util/pixclump.c brlcad/trunk/src/util/pixcount.c brlcad/trunk/src/util/pixdsplit.c brlcad/trunk/src/util/pl-ps.c brlcad/trunk/src/util/random.c brlcad/trunk/src/util/terrain.c brlcad/trunk/src/util/wavelet.c Modified: brlcad/trunk/src/util/azel.c =================================================================== --- brlcad/trunk/src/util/azel.c 2010-10-18 17:34:20 UTC (rev 41048) +++ brlcad/trunk/src/util/azel.c 2010-10-18 17:39:57 UTC (rev 41049) @@ -110,7 +110,6 @@ char *outFname = "stdout"; /* Name of output destination */ char *Label; /* Names of input coordinates */ char Tail[4096] = {0}; /* Rest of input line beyond coords */ - extern char *bu_optarg; /* argument from bu_getopt(3C) */ FILE *inPtr = stdin; /* Pointer to input */ FILE *outPtr = stdout; /* Pointer to output */ double Azim = 0.0; /* Azimuth angle (in degrees) */ @@ -141,7 +140,6 @@ int LineNm = 0; /* How far through input? */ int Ch; /* Input character */ int i; /* Dummy variable for loop indexing */ - extern int bu_optind; /* index from bu_getopt(3C) */ /* Handle command-line options */ while ((Ch = bu_getopt(argc, argv, OPT_STRING)) != EOF) Modified: brlcad/trunk/src/util/dsp_add.c =================================================================== --- brlcad/trunk/src/util/dsp_add.c 2010-10-18 17:34:20 UTC (rev 41048) +++ brlcad/trunk/src/util/dsp_add.c 2010-10-18 17:39:57 UTC (rev 41049) @@ -38,11 +38,6 @@ /* declarations to support use of bu_getopt() system call */ char *options = "h"; -extern char *bu_optarg; -extern int bu_optind, bu_opterr; - -/*, bu_getopt(int, char *const *, const char *);*/ - char *progname = "(noname)"; #define ADD_STYLE_INT 0 Modified: brlcad/trunk/src/util/imgdims.c =================================================================== --- brlcad/trunk/src/util/imgdims.c 2010-10-18 17:34:20 UTC (rev 41048) +++ brlcad/trunk/src/util/imgdims.c 2010-10-18 17:39:57 UTC (rev 41049) @@ -105,9 +105,6 @@ unsigned long int height; struct stat stat_buf; - extern int bu_optind; /* index from bu_getopt(3C) */ - extern char *bu_optarg; /* argument from bu_getopt(3C) */ - /* * Process the command line */ Modified: brlcad/trunk/src/util/orle-pix.c =================================================================== --- brlcad/trunk/src/util/orle-pix.c 2010-10-18 17:34:20 UTC (rev 41048) +++ brlcad/trunk/src/util/orle-pix.c 2010-10-18 17:39:57 UTC (rev 41049) @@ -152,8 +152,7 @@ pars_Argv(int argc, char **argv) { int c; - extern int bu_optind; - extern char *bu_optarg; + /* Parse options. */ while ((c = bu_getopt(argc, argv, "b:dv")) != EOF) { switch (c) { Modified: brlcad/trunk/src/util/pixclump.c =================================================================== --- brlcad/trunk/src/util/pixclump.c 2010-10-18 17:34:20 UTC (rev 41048) +++ brlcad/trunk/src/util/pixclump.c 2010-10-18 17:39:57 UTC (rev 41049) @@ -174,9 +174,6 @@ int best_diff; /* error in best match */ int this_diff; /* pixel-color_tbl difference */ - extern int bu_optind; /* index from bu_getopt(3C) */ - extern char *bu_optarg; /* argument from bu_getopt(3C) */ - /* * Initialize the color table */ Modified: brlcad/trunk/src/util/pixcount.c =================================================================== --- brlcad/trunk/src/util/pixcount.c 2010-10-18 17:34:20 UTC (rev 41048) +++ brlcad/trunk/src/util/pixcount.c 2010-10-18 17:39:57 UTC (rev 41049) @@ -194,9 +194,6 @@ int ch; /* current char in command line */ struct pixel *pp; - extern int bu_optind; /* index from bu_getopt(3C) */ - extern char *bu_optarg; /* argument from bu_getopt(3C) */ - /* * Process the command line */ Modified: brlcad/trunk/src/util/pixdsplit.c =================================================================== --- brlcad/trunk/src/util/pixdsplit.c 2010-10-18 17:34:20 UTC (rev 41048) +++ brlcad/trunk/src/util/pixdsplit.c 2010-10-18 17:39:57 UTC (rev 41049) @@ -76,9 +76,6 @@ int cfd = -1; /* " " */ int dfd = -1; /* " " */ - extern int bu_optind; /* index from bu_getopt(3C) */ - extern char *bu_optarg; /* argument from bu_getopt(3C) */ - c_per_p = 3; cf_name = "-"; d_per_p = 1; df_name = ""; while ((ch = bu_getopt(argc, argv, OPT_STRING)) != EOF) Modified: brlcad/trunk/src/util/pl-ps.c =================================================================== --- brlcad/trunk/src/util/pl-ps.c 2010-10-18 17:34:20 UTC (rev 41048) +++ brlcad/trunk/src/util/pl-ps.c 2010-10-18 17:39:57 UTC (rev 41049) @@ -125,9 +125,6 @@ #define DEFAULT_SIZE 6.75 /* default output size in inches */ -extern char *bu_optarg; -extern int bu_optind; - int encapsulated = 0; /* encapsulated postscript */ int center = 0; /* center output on 8.5 x 11 page */ int width = 4096; /* Our integer plotting space */ Modified: brlcad/trunk/src/util/random.c =================================================================== --- brlcad/trunk/src/util/random.c 2010-10-18 17:34:20 UTC (rev 41048) +++ brlcad/trunk/src/util/random.c 2010-10-18 17:39:57 UTC (rev 41049) @@ -39,9 +39,6 @@ int main(int argc, char *argv[]) { - extern int bu_optind; - extern char *bu_optarg; - struct bn_gauss *gp; struct bn_unif *up; Modified: brlcad/trunk/src/util/terrain.c =================================================================== --- brlcad/trunk/src/util/terrain.c 2010-10-18 17:34:20 UTC (rev 41048) +++ brlcad/trunk/src/util/terrain.c 2010-10-18 17:39:57 UTC (rev 41049) @@ -49,8 +49,6 @@ /* declarations to support use of bu_getopt() system call */ char *options = "w:n:s:L:H:O:S:V:D:f:co:v"; -extern char *bu_optarg; -extern int bu_optind, bu_opterr, bu_getopt(int, char *const *, const char *); int do_convert = 1; char *progname = "(noname)"; Modified: brlcad/trunk/src/util/wavelet.c =================================================================== --- brlcad/trunk/src/util/wavelet.c 2010-10-18 17:34:20 UTC (rev 41048) +++ brlcad/trunk/src/util/wavelet.c 2010-10-18 17:39:57 UTC (rev 41049) @@ -63,8 +63,6 @@ /* declarations to support use of bu_getopt() system call */ char *options = "W:S:s:w:n:t:#:D:12drR:"; -extern char *bu_optarg; -extern int bu_optind, bu_opterr, bu_getopt(int, char *const *, const char *); char *progname = "(noname)"; int img_space=1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |