Changeset: 2fe764d692fc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2fe764d692fc
Removed Files:
monetdb5/modules/atoms/mcurl.h
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/atoms/mcurl.c
Branch: default
Log Message:
Removed unnecessary file.
diffs (80 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1370,7 +1370,6 @@ str CSTreleaseAll(Client cntxt, MalBlkPt
str CSTtake(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CSTtoString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CURLgetRequest(str *retval, str *url);
-str CURLgetRequest(str *retval, str *url);
str CemptySet(int *k, int *bid);
str DICTbind(int *idx, int *val, str *nme);
str DICTcompress(int *idx, str *nme, int *bid);
diff --git a/monetdb5/modules/atoms/Makefile.ag
b/monetdb5/modules/atoms/Makefile.ag
--- a/monetdb5/modules/atoms/Makefile.ag
+++ b/monetdb5/modules/atoms/Makefile.ag
@@ -37,7 +37,7 @@ lib_atoms = {
url.c url.h \
json_atom.c json_atom.h \
uuid.c uuid.h \
- mcurl.c mcurl.h \
+ mcurl.c \
xml.c xml.h
}
diff --git a/monetdb5/modules/atoms/mcurl.c b/monetdb5/modules/atoms/mcurl.c
--- a/monetdb5/modules/atoms/mcurl.c
+++ b/monetdb5/modules/atoms/mcurl.c
@@ -25,7 +25,6 @@
*/
#include "monetdb_config.h"
-#include "mcurl.h"
#include "mal.h"
#include "mal_exception.h"
diff --git a/monetdb5/modules/atoms/mcurl.h b/monetdb5/modules/atoms/mcurl.h
deleted file mode 100644
--- a/monetdb5/modules/atoms/mcurl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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-2013 MonetDB B.V.
- * All Rights Reserved.
-*/
-/*
- * @-
- * Wrapper around curl library
- */
-#ifndef MCURL_H
-#define MCURL_H
-
-#include <gdk.h>
-#include <ctype.h>
-
-#ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5)
-#define curl_export extern __declspec(dllimport)
-#else
-#define curl_export extern __declspec(dllexport)
-#endif
-#else
-#define curl_export extern
-#endif
-
-curl_export str CURLgetRequest(str *retval, str *url);
-
-#endif /* MCURL_H */
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
