Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/runtime ll_upwards.mx, , 1.29, 1.30 vx_index.mx, , 1.1, 1.2
On Tue, Sep 16, 2008 at 09:19:52AM +0000, Lefteris Sidirourgos wrote:
Update of /cvsroot/monetdb/pathfinder/runtime In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29372
Modified Files: ll_upwards.mx vx_index.mx Log Message: Trying to fix some compilation errors arised in SunOS and Federa 9 (?). In my Fedora 9 everything compiled correct.
as opposed to (e.g.) gcc 4.1.2 on Fedora 8, gcc 4.3.0 on Fedora 9 (recall, out desktops still run Fedora 8 with gcc 4.1.2), gcc 4.3.1 on Gentoo 1.12.11.1, and Sun Studio 12 compiler on (Open)Solaris 11 seem to adhere to and implement the C99 standard of INLINE declarations. Please see (e.g.) http://www.greenend.org.uk/rjk/2003/03/inline.html and compare "GNU C inline rules" to "C99 inline rules". The latter says (a.o.) " A function where all the declarations (including the definition) mention "inline" and never "extern". There must be a definition in the same translation unit. No stand-alone object code is emitted. You can (must?) have a separate (not inline) definition in another translation unit, and the compiler might choose either that or the inline definition. " Maybe this helps ... Stefan
U vx_index.mx Index: vx_index.mx =================================================================== RCS file: /cvsroot/monetdb/pathfinder/runtime/vx_index.mx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- vx_index.mx 15 Sep 2008 10:30:29 -0000 1.1 +++ vx_index.mx 16 Sep 2008 09:19:50 -0000 1.2 @@ -32,6 +32,8 @@ @c #include "pf_config.h" #include
+#include "shredder.h" /* for XML_DEPTH_MAX */ +#include "ll_upwards.h" /* skipholes, speculate_skip, PF_SIBLING_PROBES */ #define XQH_UNSGN(v) ((unsigned int) v) #define XQH_MASK5(c) ((c) & 31) @@ -190,11 +192,7 @@
@c -#include "shredder.h" /* for XML_DEPTH_MAX */ -#include "ll_upwards.h" /* skipholes, speculate_skip, PF_SIBLING_PROBES */ - -static -int +static int vx_index_create( /* OUTPUT: */ unsigned int* pre_hsh, /* - pre_hsh column */ /* DOCUMENT: */
U ll_upwards.mx Index: ll_upwards.mx =================================================================== RCS file: /cvsroot/monetdb/pathfinder/runtime/ll_upwards.mx,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- ll_upwards.mx 15 Sep 2008 10:26:44 -0000 1.29 +++ ll_upwards.mx 16 Sep 2008 09:19:50 -0000 1.30 @@ -90,11 +90,13 @@ pathfinder runtime.
@h +#ifndef LL_UPWARDS_H +#define LL_UPWARDS_H #define PF_SIBLING_PROBES 64
INLINE oid skipholes(oid, unsigned int *); oid speculate_skip(oid, oid, oid, int, unsigned int*, unsigned char*); - +#endif /* LL_UPWARDS_H */
@c #include "pf_config.h"
------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Monetdb-pf-checkins mailing list Monetdb-pf-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
-- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |
participants (1)
-
Stefan Manegold