Changeset: 659abbe2473d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=659abbe2473d
Modified Files:
sql/backends/monet5/UDF/capi/Tests/All
sql/backends/monet5/UDF/capi/capi.c
Branch: jitudf
Log Message:
Compilation fixes.
diffs (93 lines):
diff --git a/sql/backends/monet5/UDF/capi/Tests/All
b/sql/backends/monet5/UDF/capi/Tests/All
--- a/sql/backends/monet5/UDF/capi/Tests/All
+++ b/sql/backends/monet5/UDF/capi/Tests/All
@@ -1,14 +1,14 @@
-capi00
-capi01
-capi02
-capi03
-capi04
-capi05
-capi06
-capi07
-capi08
-capi09
-capi10
-capi11
-capi12
+NOT_WIN32?capi00
+NOT_WIN32?capi01
+NOT_WIN32?capi02
+NOT_WIN32?capi03
+NOT_WIN32?capi04
+NOT_WIN32?capi05
+NOT_WIN32?capi06
+NOT_WIN32?capi07
+NOT_WIN32?capi08
+NOT_WIN32?capi09
+NOT_WIN32?capi10
+NOT_WIN32?capi11
+NOT_WIN32?capi12
diff --git a/sql/backends/monet5/UDF/capi/capi.c
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -16,7 +16,6 @@
#include <setjmp.h>
#include <signal.h>
#include <stdio.h>
-#include <malloc.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/mman.h>
@@ -348,7 +347,6 @@ const char *cpp_flag = "capi_cpp";
static size_t GetTypeCount(int type, void *struct_ptr);
static void *GetTypeData(int type, void *struct_ptr);
-static const char *GetTypeDefinition(int type);
static const char *GetTypeName(int type);
static void data_from_date(date d, cudf_data_date *ptr);
@@ -1521,42 +1519,6 @@ wrapup:
return msg;
}
-static const char *GetTypeDefinition(int type)
-{
- const char *tpe = NULL;
- if (type == TYPE_bit) {
- tpe = "signed char";
- } else if (type == TYPE_bte) {
- tpe = "signed char";
- } else if (type == TYPE_sht) {
- tpe = "short";
- } else if (type == TYPE_int) {
- tpe = "int";
- } else if (type == TYPE_oid) {
- tpe = "size_t";
- } else if (type == TYPE_lng) {
- tpe = "lng";
- } else if (type == TYPE_flt) {
- tpe = "float";
- } else if (type == TYPE_dbl) {
- tpe = "double";
- } else if (type == TYPE_str) {
- tpe = "char*";
- } else if (type == TYPE_date) {
- tpe = "cudf_data_date";
- } else if (type == TYPE_daytime) {
- tpe = "cudf_data_time";
- } else if (type == TYPE_timestamp) {
- tpe = "cudf_data_timestamp";
- } else if (type == TYPE_blob || type == TYPE_sqlblob) {
- tpe = "cudf_data_blob";
- } else {
- // unsupported type: string
- tpe = "char*";
- }
- return tpe;
-}
-
static const char *GetTypeName(int type)
{
const char *tpe = NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
