MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

Changeset: 52e38de31459 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=52e38de31459
Modified Files:
        
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (36 lines):

diff -r 050a21b9a0f8 -r 52e38de31459 pathfinder/compiler/include/pf_ferry.h
--- a/pathfinder/compiler/include/pf_ferry.h    Tue Sep 14 14:19:16 2010 +0200
+++ b/pathfinder/compiler/include/pf_ferry.h    Tue Sep 14 17:04:42 2010 +0200
@@ -36,6 +36,16 @@
 #ifndef FERRY_LIB_H
 #define FERRY_LIB_H
 
+#ifdef WIN32
+#ifndef LIBPF_FERRY
+#define pf_ferry_export extern __declspec(dllimport)
+#else
+#define pf_ferry_export extern __declspec(dllexport)
+#endif
+#else
+#define pf_ferry_export extern
+#endif
+
 /* the maximum size of the initialized error buffer */
 #define ERR_SIZE 4096
 
@@ -65,6 +75,7 @@
  * @param format the output format (see definition of PFoutput_format_t)
  * @return       the return code
  */
+pf_ferry_export
 int PFcompile_ferry (char **res,
                      char *err,
                      char *xml,
@@ -83,6 +94,7 @@
  * @param opt_args the optimization arguments (see pf option -o)
  * @return         the return code
  */
+pf_ferry_export
 int PFcompile_ferry_opt (char **res, 
                          char *err,
                          char *xml,
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list