MonetDB: Apr2011 - merovingian: rename BOOL to BOOLEAN

[Holger Pirk]

Changeset: 2c80dea79f06 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2c80dea79f06
Modified Files:
        tools/merovingian/utils/properties.c
        tools/merovingian/utils/utils.c
        tools/merovingian/utils/utils.h
Branch: Apr2011
Log Message:

merovingian: rename BOOL to BOOLEAN

renaming valtype BOOL to BOOLEAN in merovingian because BOOL is a
reserved word in objective-c which prevents merovingian utils from being
used in objective-c

Signed-off-by: Fabian Groffen <fab...@cwi.nl>


diffs (45 lines):

diff --git a/tools/merovingian/utils/properties.c 
b/tools/merovingian/utils/properties.c
--- a/tools/merovingian/utils/properties.c
+++ b/tools/merovingian/utils/properties.c
@@ -40,7 +40,7 @@
        {"optpipe",  NULL, 0, STR},
        {"master",   NULL, 0, STR},
        {"slave",    NULL, 0, MURI},
-       {"readonly", NULL, 0, BOOL},
+       {"readonly", NULL, 0, BOOLEAN},
        { NULL,      NULL, 0, INVALID}
 };
 
@@ -223,7 +223,7 @@
                         * it is a freeform string, that sometimes happens to 
be a
                         * UUID)
                         * first perform a sneaky hack to do the boolean check 
*/
-                       kv->type = BOOL;
+                       kv->type = BOOLEAN;
                        if ((err = setConfVal(kv, val)) != NULL) {
                                free(err);
                                /* restore */
diff --git a/tools/merovingian/utils/utils.c b/tools/merovingian/utils/utils.c
--- a/tools/merovingian/utils/utils.c
+++ b/tools/merovingian/utils/utils.c
@@ -174,7 +174,7 @@
                        }
                        ival = atoi(val);
                }; break;
-               case BOOL: {
+               case BOOLEAN: {
                        if (strcasecmp(val, "true") == 0 ||
                                        strcasecmp(val, "yes") == 0 ||
                                        strcmp(val, "1") == 0)
diff --git a/tools/merovingian/utils/utils.h b/tools/merovingian/utils/utils.h
--- a/tools/merovingian/utils/utils.h
+++ b/tools/merovingian/utils/utils.h
@@ -26,7 +26,7 @@
 enum valtype {
        INVALID = 0,
        INT,
-       BOOL,
+       BOOLEAN,
        STR,
        MURI,
        OTHER
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list