Redefine the default boolean type to gmx_bool.

[alexxy/gromacs.git] / src / tools / gmx_xpm2ps.c

diff --git a/src/tools/gmx_xpm2ps.c b/src/tools/gmx_xpm2ps.c
index 7da02a8d2a357f5a6bd94e022a8861454b2df018..cb5aa034dab7249d2999ff3dadd8dfe22621bc07 100644 (file)
--- a/src/tools/gmx_xpm2ps.c
+++ b/src/tools/gmx_xpm2ps.c
@@ -60,7 +60,7 @@ typedef struct {
   real major;
   real minor;
   real offset;
-  bool first;
+  gmx_bool first;
   int  lineatzero;
   real majorticklen;
   real minorticklen;
@@ -75,12 +75,12 @@ typedef struct {
   int  bw;
   real linewidth;
   real xoffs,yoffs;
-  bool bTitle;
-  bool bTitleOnce;
-  bool bYonce;
+  gmx_bool bTitle;
+  gmx_bool bTitleOnce;
+  gmx_bool bYonce;
   real titfontsize;
   char titfont[STRLEN];
-  bool legend;
+  gmx_bool legend;
   real legfontsize;
   char legfont[STRLEN];
   char leglabel[STRLEN];
@@ -102,7 +102,7 @@ enum { ecSel, ecHalves, ecAdd, ecSub, ecMult, ecDiv, ecNR };
 
 void get_params(const char *mpin,const char *mpout,t_psrec *psr)
 {
-  static const char *bools[BOOL_NR+1]  = { "no", "yes", NULL };
+  static const char *gmx_bools[BOOL_NR+1]  = { "no", "yes", NULL };
   /* this must correspond to t_rgb *linecolors[] below */
   static const char *colors[] = { "none", "black", "white", NULL };
   warninp_t wi;
@@ -117,11 +117,11 @@ void get_params(const char *mpin,const char *mpout,t_psrec *psr)
   } else {
     inp = NULL;
   }
-  ETYPE("black&white",    psr->bw,             bools);
+  ETYPE("black&white",    psr->bw,             gmx_bools);
   RTYPE("linewidth",      psr->linewidth,      1.0);
   STYPE("titlefont",      psr->titfont,        "Helvetica");
   RTYPE("titlefontsize",  psr->titfontsize,    20.0);
-  ETYPE("legend",         psr->legend,         bools);
+  ETYPE("legend",         psr->legend,         gmx_bools);
   STYPE("legendfont",     psr->legfont,        psr->titfont);
   STYPE("legendlabel",    psr->leglabel,       "");
   STYPE("legend2label",   psr->leg2label,      psr->leglabel);
@@ -138,7 +138,7 @@ void get_params(const char *mpin,const char *mpout,t_psrec *psr)
   RTYPE("x-major",        psr->X.major,        NOTSET);
   RTYPE("x-minor",        psr->X.minor,        NOTSET);
   RTYPE("x-firstmajor",   psr->X.offset,       0.0);
-  ETYPE("x-majorat0",     psr->X.first,        bools);
+  ETYPE("x-majorat0",     psr->X.first,        gmx_bools);
   RTYPE("x-majorticklen", psr->X.majorticklen, 8.0);
   RTYPE("x-minorticklen", psr->X.minorticklen, 4.0);
   STYPE("x-label",        psr->X.label,        "");
@@ -150,7 +150,7 @@ void get_params(const char *mpin,const char *mpout,t_psrec *psr)
   RTYPE("y-major",        psr->Y.major,        psr->X.major);
   RTYPE("y-minor",        psr->Y.minor,        psr->X.minor);
   RTYPE("y-firstmajor",   psr->Y.offset,       psr->X.offset);
-  ETYPE("y-majorat0",     psr->Y.first,        bools);
+  ETYPE("y-majorat0",     psr->Y.first,        gmx_bools);
   RTYPE("y-majorticklen", psr->Y.majorticklen, psr->X.majorticklen);
   RTYPE("y-minorticklen", psr->Y.minorticklen, psr->X.minorticklen);
   STYPE("y-label",        psr->Y.label,        psr->X.label);
@@ -174,10 +174,10 @@ t_rgb blue  = { 0, 0, 1 };
 /* this must correspond to *colors[] in get_params */
 t_rgb *linecolors[] = { NULL, &black, &white, NULL };
 
-bool diff_maps(int nmap1,t_mapping *map1,int nmap2,t_mapping *map2)
+gmx_bool diff_maps(int nmap1,t_mapping *map1,int nmap2,t_mapping *map2)
 {
   int i;
-  bool bDiff,bColDiff=FALSE;
+  gmx_bool bDiff,bColDiff=FALSE;
 
   if (nmap1 != nmap2) 
       bDiff=TRUE;
@@ -287,7 +287,7 @@ static real box_dh(t_psrec *psr)
 }
 
 #define IS_ONCE (i==nmat-1)
-static real box_dh_top(bool bOnce, t_psrec *psr)
+static real box_dh_top(gmx_bool bOnce, t_psrec *psr)
 {
   real dh;
   
@@ -299,12 +299,12 @@ static real box_dh_top(bool bOnce, t_psrec *psr)
   return  dh;
 }
 
-static bool box_do_all_x_maj_ticks(t_psrec *psr)
+static gmx_bool box_do_all_x_maj_ticks(t_psrec *psr)
 {
   return (psr->boxspacing>(1.5*psr->X.majorticklen));
 }
 
-static bool box_do_all_x_min_ticks(t_psrec *psr)
+static gmx_bool box_do_all_x_min_ticks(t_psrec *psr)
 {
   return (psr->boxspacing>(1.5*psr->X.minorticklen));
 }
@@ -474,7 +474,7 @@ static void draw_zerolines(t_psdata out,real x0,real y0,real w,
 }
 
 static void box_dim(int nmat,t_matrix mat[],t_matrix *mat2,t_psrec *psr,
-                   int elegend,bool bFrame,
+                   int elegend,gmx_bool bFrame,
                    real *w,real *h,real *dw,real *dh)
 {
   int i,maxytick;
@@ -563,7 +563,7 @@ int add_maps(t_mapping **newmap,
 }
 
 void xpm_mat(const char *outf, int nmat,t_matrix *mat,t_matrix *mat2,
-             bool bDiag,bool bFirstDiag)
+             gmx_bool bDiag,gmx_bool bFirstDiag)
 {
   FILE   *out;
   char   buf[100];
@@ -607,7 +607,7 @@ static void tick_spacing(int n, real axis[], real offset, char axisnm,
                         real *major, real *minor)
 {
   real space;
-  bool bTryAgain,bFive;
+  gmx_bool bTryAgain,bFive;
   int  i,j,t,f=0,ten;
 #define NFACT 4
   real major_fact[NFACT] = {5, 4, 2, 1};
@@ -642,8 +642,8 @@ static void tick_spacing(int n, real axis[], real offset, char axisnm,
 }
 
 void ps_mat(const char *outf,int nmat,t_matrix mat[],t_matrix mat2[],
-           bool bFrame,bool bDiag,bool bFirstDiag,
-           bool bTitle,bool bTitleOnce,bool bYonce,int elegend,
+           gmx_bool bFrame,gmx_bool bDiag,gmx_bool bFirstDiag,
+           gmx_bool bTitle,gmx_bool bTitleOnce,gmx_bool bYonce,int elegend,
            real size,real boxx,real boxy,const char *m2p,const char *m2pout,
            int mapoffset)
 {
@@ -657,7 +657,7 @@ void ps_mat(const char *outf,int nmat,t_matrix mat[],t_matrix mat2[],
   real   w,h,dw,dh;
   int       nmap1=0,nmap2=0,leg_nmap;
   t_mapping *map1=NULL,*map2=NULL,*leg_map;
-  bool   bMap1,bNextMap1,bDiscrete;
+  gmx_bool   bMap1,bNextMap1,bDiscrete;
  
   /* memory leak: */
   libm2p = m2p ? gmxlibfn(m2p) : m2p;
@@ -987,8 +987,8 @@ void write_combined_matrix(int ecombine, const char *fn,
 }
 
 void do_mat(int nmat,t_matrix *mat,t_matrix *mat2,
-           bool bFrame,bool bZeroLine,bool bDiag,bool bFirstDiag,bool bTitle,
-           bool bTitleOnce,bool bYonce,int elegend,
+           gmx_bool bFrame,gmx_bool bZeroLine,gmx_bool bDiag,gmx_bool bFirstDiag,gmx_bool bTitle,
+           gmx_bool bTitleOnce,gmx_bool bYonce,int elegend,
            real size,real boxx,real boxy,
            const char *epsfile,const char *xpmfile,const char *m2p,
             const char *m2pout,int skip, int mapoffset)
@@ -1045,7 +1045,7 @@ void gradient_mat(rvec grad, int nmat, t_matrix mat[])
     gradient_map(grad, mat[m].nmap, mat[m].map);
 }
 
-void rainbow_map(bool bBlue, int nmap, t_mapping map[])
+void rainbow_map(gmx_bool bBlue, int nmap, t_mapping map[])
 {
   int i;
   real c,r,g,b;
@@ -1079,7 +1079,7 @@ void rainbow_map(bool bBlue, int nmap, t_mapping map[])
   }
 }
 
-void rainbow_mat(bool bBlue, int nmat, t_matrix mat[])
+void rainbow_mat(gmx_bool bBlue, int nmat, t_matrix mat[])
 {
   int m;
   
@@ -1136,8 +1136,8 @@ int gmx_xpm2ps(int argc,char *argv[])
   const char *fn,*epsfile=NULL,*xpmfile=NULL;
   int       i,nmat,nmat2,etitle,elegend,ediag,erainbow,ecombine;
   t_matrix *mat=NULL,*mat2=NULL;
-  bool      bTitle,bTitleOnce,bDiag,bFirstDiag,bGrad;
-  static bool bFrame=TRUE,bZeroLine=FALSE,bYonce=FALSE,bAdd=FALSE;
+  gmx_bool      bTitle,bTitleOnce,bDiag,bFirstDiag,bGrad;
+  static gmx_bool bFrame=TRUE,bZeroLine=FALSE,bYonce=FALSE,bAdd=FALSE;
   static real size=400,boxx=0,boxy=0,cmin=0,cmax=0;
   static rvec grad={0,0,0};
   enum                    { etSel, etTop, etOnce, etYlabel, etNone, etNR };