[Boost-commit] svn:boost r68730 - trunk/tools/build/v2/engine

Subject: [Boost-commit] svn:boost r68730 - trunk/tools/build/v2/engine
From: kbelco_at_[hidden]
Date: 2011-02-08 13:46:04

Author: noel_belcourt
Date: 2011-02-08 13:46:03 EST (Tue, 08 Feb 2011)
New Revision: 68730
URL: http://svn.boost.org/trac/boost/changeset/68730

Log:
Another try at this commit.

With gcc-4.5.2, the stuct option defined in option.h

conflicts with an identically named struct in the gcc 
headers.  Renamed the bjam struct to bjam_option in all
places where referenced.

Text files modified: 
   trunk/tools/build/v2/engine/jam.c    |     2 +-                                      
   trunk/tools/build/v2/engine/option.c |     4 ++--                                    
   trunk/tools/build/v2/engine/option.h |     8 ++++----                                
   3 files changed, 7 insertions(+), 7 deletions(-)

Modified: trunk/tools/build/v2/engine/jam.c
==============================================================================
--- trunk/tools/build/v2/engine/jam.c	(original)
+++ trunk/tools/build/v2/engine/jam.c	2011-02-08 13:46:03 EST (Tue, 08 Feb 2011)
@@ -217,7 +217,7 @@
 {
     int                     n;
     char                  * s;
-    struct option           optv[N_OPTS];
+    struct bjam_option      optv[N_OPTS];
     char            const * all = "all";
     int                     status;
     int                     arg_c = argc;

Modified: trunk/tools/build/v2/engine/option.c
==============================================================================
--- trunk/tools/build/v2/engine/option.c	(original)
+++ trunk/tools/build/v2/engine/option.c	2011-02-08 13:46:03 EST (Tue, 08 Feb 2011)
@@ -17,7 +17,7 @@
  *        was supplied for an option that does not require one."
  */
 
-int getoptions( int argc, char * * argv, char * opts, option * optv )
+int getoptions( int argc, char * * argv, char * opts, bjam_option * optv )
 {
     int i;
     int optc = N_OPTS;
@@ -84,7 +84,7 @@
  * Name: getoptval() - find an option given its character.
  */
 
-char * getoptval( option * optv, char opt, int subopt )
+char * getoptval( bjam_option * optv, char opt, int subopt )
 {
     int i;
     for ( i = 0; i < N_OPTS; ++i, ++optv )

Modified: trunk/tools/build/v2/engine/option.h
==============================================================================
--- trunk/tools/build/v2/engine/option.h	(original)
+++ trunk/tools/build/v2/engine/option.h	2011-02-08 13:46:03 EST (Tue, 08 Feb 2011)
@@ -11,13 +11,13 @@
  *  \ -) "Command line option."
  */
 
-typedef struct option
+typedef struct bjam_option
 {
     char    flag;       /* filled in by getoption() */
     char    *val;       /* set to random address if true */
-} option;
+} bjam_option;
 
 # define N_OPTS 256
 
-int     getoptions( int argc, char **argv, char *opts, option *optv );
-char *  getoptval( option *optv, char opt, int subopt );
+int     getoptions( int argc, char **argv, char *opts, bjam_option *optv );
+char *  getoptval( bjam_option *optv, char opt, int subopt );