From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ip6-localhost (8.3.3.3.0.d.e.f.f.f.2.d.4.2.2.0.5.9.a.d.8.a.b.f.0.b.8.0.1.0.0.2.ip6.arpa [IPv6:2001:8b0:fba8:da95:224:d2ff:fed0:3338]) by hurricane.the-brannons.com (Postfix) with ESMTPS id 0CE2277AD7 for ; Tue, 24 Dec 2013 07:38:50 -0800 (PST) Received: from adam by ip6-localhost with local (Exim 4.82) (envelope-from ) id 1VvU4B-0007xq-KV; Tue, 24 Dec 2013 15:38:43 +0000 From: Adam Thompson To: edbrowse-dev@lists.the-brannons.com Date: Tue, 24 Dec 2013 15:38:26 +0000 Message-Id: <1387899508-30407-2-git-send-email-arthompson1990@gmail.com> X-Mailer: git-send-email 1.8.5.2.297.g3e57c29 In-Reply-To: <1387899508-30407-1-git-send-email-arthompson1990@gmail.com> References: <1387899508-30407-1-git-send-email-arthompson1990@gmail.com> Subject: [Edbrowse-dev] [PATCH 2/4] Alter bool typedef to eb_bool in eb.h X-BeenThere: edbrowse-dev@lists.the-brannons.com X-Mailman-Version: 2.1.17 Precedence: list List-Id: Edbrowse Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Dec 2013 15:38:50 -0000 --- src/eb.h | 76 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/eb.h b/src/eb.h index c5f2098..dfe51c0 100644 --- a/src/eb.h +++ b/src/eb.h @@ -76,9 +76,9 @@ typedef unsigned long ulong; typedef unsigned char uchar; /* We use uchar for boolean fields. */ -typedef uchar bool; -#define true 1 -#define false 0 +typedef uchar eb_bool; +#define eb_true 1 +#define eb_false 0 typedef ushort idNameCode; @@ -175,7 +175,7 @@ struct MACCOUNT { /* pop3 account */ struct MIMETYPE { char *type, *desc; char *suffix, *prot, *program; - bool stream; + eb_bool stream; }; struct DBTABLE { @@ -193,22 +193,22 @@ extern int debugLevel; /* 0 to 9 */ extern int displayLength; /* when printing a line */ extern int webTimeout, mailTimeout; extern int browseLine; /* line number, for error reporting */ -extern bool ismc; /* Is the program running as a mail client? */ -extern bool cons_utf8; /* does the console expect utf8? */ -extern bool iuConvert; /* perform iso utf8 conversions automatically */ +extern eb_bool ismc; /* Is the program running as a mail client? */ +extern eb_bool cons_utf8; /* does the console expect utf8? */ +extern eb_bool iuConvert; /* perform iso utf8 conversions automatically */ extern char type8859; /* 1 through 15 */ -extern bool js_redirects; /* window.location = new_url */ +extern eb_bool js_redirects; /* window.location = new_url */ extern uchar browseLocal; /* browsing a local file */ -extern bool parsePage; /* parsing the html page, and any java therein */ -extern bool htmlAttrVal_nl; /* allow nl in the attribute of an html tag */ -extern bool passMail; /* pass mail across the filters */ -extern bool errorExit; /* exit on any error, for scripting purposes */ -extern bool isInteractive; -extern volatile bool intFlag; /* set this when interrupt signal is caught */ -extern bool binaryDetect; -extern bool inputReadLine; -extern bool listNA; /* list nonascii chars */ -extern bool inInput; /* reading line from standard in */ +extern eb_bool parsePage; /* parsing the html page, and any java therein */ +extern eb_bool htmlAttrVal_nl; /* allow nl in the attribute of an html tag */ +extern eb_bool passMail; /* pass mail across the filters */ +extern eb_bool errorExit; /* exit on any error, for scripting purposes */ +extern eb_bool isInteractive; +extern volatile eb_bool intFlag; /* set this when interrupt signal is caught */ +extern eb_bool binaryDetect; +extern eb_bool inputReadLine; +extern eb_bool listNA; /* list nonascii chars */ +extern eb_bool inInput; /* reading line from standard in */ extern int fileSize; /* when reading/writing files */ extern int maxFileSize; /* max size of an editable file */ extern int mssock; /* mail server socket */ @@ -227,15 +227,15 @@ extern struct MACCOUNT accounts[]; /* all the email accounts */ extern int maxMime; /* how many mime types specified */ extern struct MIMETYPE mimetypes[]; extern char *dbarea, *dblogin, *dbpw; /* to log into the database */ -extern bool fetchBlobColumns; +extern eb_bool fetchBlobColumns; extern char *proxy_host; -extern bool caseInsensitive, searchStringsAll; -extern bool undoable; /* an undoable operation is taking place */ -extern bool allowRedirection; /* from http code 301, or http refresh */ -extern bool sendReferrer; /* in the http header */ -extern bool allowJS; /* javascript on */ -extern bool helpMessagesOn; /* no need to type h */ -extern bool showHiddenFiles; /* during directory scan */ +extern eb_bool caseInsensitive, searchStringsAll; +extern eb_bool undoable; /* an undoable operation is taking place */ +extern eb_bool allowRedirection; /* from http code 301, or http refresh */ +extern eb_bool sendReferrer; /* in the http header */ +extern eb_bool allowJS; /* javascript on */ +extern eb_bool helpMessagesOn; /* no need to type h */ +extern eb_bool showHiddenFiles; /* during directory scan */ extern uchar dirWrite; /* directory write mode, e.g. rename files */ extern uchar endMarks; /* do we print ^ $ at the start and end of lines? */ extern int context; /* which session (buffer) are we in? */ @@ -337,19 +337,19 @@ struct ebWindow { * Number 0 means the label is not set. */ int labels[26], r_labels[26]; /* Yeah, these could be bit fields in the structure :1; but who cares. */ - bool lhs_yes, rhs_yes; - bool binMode; /* binary file */ - bool nlMode; /* newline at the end */ - bool rnlMode; + eb_bool lhs_yes, rhs_yes; + eb_bool binMode; /* binary file */ + eb_bool nlMode; /* newline at the end */ + eb_bool rnlMode; /* Two text modes; these are incompatible with binMode */ - bool utf8Mode; - bool iso8859Mode; - bool browseMode; /* browsing html */ - bool changeMode; /* something has changed in this file */ - bool dirMode; /* directory mode */ - bool firstOpMode; /* first change has been made, undo is possible */ - bool jsdead; /* javascript is dead, for this window */ - bool sqlMode; /* accessing a table */ + eb_bool utf8Mode; + eb_bool iso8859Mode; + eb_bool browseMode; /* browsing html */ + eb_bool changeMode; /* something has changed in this file */ + eb_bool dirMode; /* directory mode */ + eb_bool firstOpMode; /* first change has been made, undo is possible */ + eb_bool jsdead; /* javascript is dead, for this window */ + eb_bool sqlMode; /* accessing a table */ char *dw; /* document.write string */ int dw_l; /* length of the above */ void *tags; /* array of html tags, when browsing */ -- 1.8.5.2.297.g3e57c29