Changeset: 33287e349a6d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/33287e349a6d
Modified Files:
sql/backends/monet5/rel_bin.c
sql/server/rel_updates.c
sql/server/sql_tokens.h
Branch: copyintobinary
Log Message:
Get rid of some #ifdefs in the code
diffs (48 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -5837,11 +5837,7 @@ rel2bin_output(backend *be, sql_rel *rel
list_append(slist, export);
} else if (tpe == TYPE_int) {
endianness endian = take_atom_arg(&argnode, TYPE_int)->val.ival;
-#ifdef WORDS_BIGENDIAN
- bool do_byteswap = endian == endian_little;
-#else
- bool do_byteswap = endian == endian_big;
-#endif
+ bool do_byteswap = (endian != endian_native && endian !=
OUR_ENDIANNESS);
int on_client = take_atom_arg(&argnode, TYPE_int)->val.ival;
assert(sub->type == st_list);
list *collist = sub->op4.lval;
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -1763,12 +1763,7 @@ bincopyfrom(sql_query *query, dlist *qna
if (!collist)
return NULL;
- bool do_byteswap =
- #ifdef WORDS_BIGENDIAN
- endian == endian_little;
- #else
- endian == endian_big;
- #endif
+ bool do_byteswap = (endian != endian_native && endian !=
OUR_ENDIANNESS);
f->res = table_column_types(sql->sa, t);
sql_find_subtype(&strtpe, "varchar", 0, 0);
diff --git a/sql/server/sql_tokens.h b/sql/server/sql_tokens.h
--- a/sql/server/sql_tokens.h
+++ b/sql/server/sql_tokens.h
@@ -191,4 +191,11 @@ typedef enum {
endian_native = 3,
} endianness;
+#ifdef WORDS_BIGENDIAN
+#define OUR_ENDIANNESS endian_big
+#else
+#define OUR_ENDIANNESS endian_little
#endif
+
+
+#endif
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
