boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 13:02:11 +00:00
Code Issues Projects Releases Wiki Activity

Another try at this commit.

Browse Source 
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.



[SVN r68730]
This commit is contained in:
K. Noel Belcourt
2011-02-08 18:46:03 +00:00
parent e144c5ed0a
commit 62d1e7cc11
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
v2/engine/jam.c
View File

@@ -217,7 +217,7 @@ int main( int argc, char * * argv, char * * arg_environ )
{
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;

4
v2/engine/option.c
View File

@@ -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 @@ int getoptions( int argc, char * * argv, char * opts, option * optv )
* 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 )

8
v2/engine/option.h
View File

@@ -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 );