Changeset: 9f317751278f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f317751278f
Added Files:
gdk/gdk_value.c
Removed Files:
gdk/gdk_value.mx
Modified Files:
gdk/Makefile.ag
Branch: default
Log Message:
Converted gdk_value.mx to gdk_value.c.
diffs (85 lines):
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -38,7 +38,7 @@ lib_gdk = {
gdk_search.mx gdk_tm.c gdk_align.c gdk_bbp.mx \
gdk_heap.c gdk_setop.mx gdk_utils.c gdk_utils.h gdk_atoms.mx \
gdk_qsort.mx gdk_ssort.mx gdk_storage.c gdk_bat.c gdk_bat.h \
- gdk_delta.c gdk_relop.mx gdk_system.c gdk_value.mx \
+ gdk_delta.c gdk_relop.mx gdk_system.c gdk_value.c \
gdk_rangejoin.mx \
gdk_posix.c gdk_logger.c gdk_sample.c \
gdk_private.h gdk_delta.h gdk_logger.h gdk_posix.h \
diff --git a/gdk/gdk_value.mx b/gdk/gdk_value.c
rename from gdk/gdk_value.mx
rename to gdk/gdk_value.c
--- a/gdk/gdk_value.mx
+++ b/gdk/gdk_value.c
@@ -1,25 +1,22 @@
-@/
-The contents of this file are subject to the MonetDB Public License
-Version 1.1 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://www.monetdb.org/Legal/MonetDBLicense
+/*
+ * The contents of this file are subject to the MonetDB Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.monetdb.org/Legal/MonetDBLicense
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is the MonetDB Database System.
+ *
+ * The Initial Developer of the Original Code is CWI.
+ * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+ * Copyright August 2008-2012 MonetDB B.V.
+ * All Rights Reserved.
+ */
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is the MonetDB Database System.
-
-The Initial Developer of the Original Code is CWI.
-Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-Copyright August 2008-2012 MonetDB B.V.
-All Rights Reserved.
-@
-
-@f gdk_value
-
-@c
/*
* @a Martin L. Kersten & Peter Boncz
* @v 2.0
@@ -246,7 +243,7 @@ int
VALcmp(ValPtr p, ValPtr q)
{
- int (*cmp) (const void *, const void *);
+ int (*cmp)(const void *, const void *);
int tpe;
ptr nilptr, pp, pq;
@@ -261,11 +258,10 @@ VALcmp(ValPtr p, ValPtr q)
nilptr = ATOMnilptr(tpe);
pp = VALget(p);
pq = VALget(q);
- if (((*cmp) (pp, nilptr) == 0) && ((*cmp) (pq, nilptr) == 0))
+ if ((*cmp)(pp, nilptr) == 0 && (*cmp)(pq, nilptr) == 0)
return 0; /* eq nil val */
- if (((*cmp) (pp, nilptr) == 0) || ((*cmp) (pq, nilptr) == 0))
+ if ((*cmp)(pp, nilptr) == 0 || (*cmp)(pq, nilptr) == 0)
return -1;
- return ((*cmp) (pp, pq));
+ return (*cmp)(pp, pq);
}
-
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
