[Monetdb-developers] [Monetdb-sql-checkins] sql/src/backends/monet5/merovingian utils.c, , 1.1, 1.2 utils.h, , 1.1, 1.2

Stefan Manegold Stefan.Manegold at cwi.nl
Fri May 29 10:21:34 CEST 2009


On Fri, May 29, 2009 at 08:15:22AM +0000, Fabian wrote:
> Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
> In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9054
> 
> Modified Files:
> 	utils.c utils.h 
> Log Message:
> don't include xxx_config.h in .h files to avoid redeclarations, hopefully this fixes some misc complaints on Debian and co.
> 
> U utils.c
> Index: utils.c
> ===================================================================
> RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/utils.c,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- utils.c	28 May 2009 12:20:46 -0000	1.1
> +++ utils.c	29 May 2009 08:15:20 -0000	1.2
> @@ -24,6 +24,7 @@
>   */
>  
>  #include "utils.h"
> +#include "sql_config.h"

xxx_config.h should (must) be the *first* include in each .c source file
(and it must be include only once).

Stefan

>  #include <stdio.h> /* fprintf, fgets */
>  #include <string.h> /* memcpy */
>  #include <gdk.h> /* GDKmalloc */
> 
> U utils.h
> Index: utils.h
> ===================================================================
> RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/utils.h,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- utils.h	28 May 2009 12:20:46 -0000	1.1
> +++ utils.h	29 May 2009 08:15:20 -0000	1.2
> @@ -20,7 +20,6 @@
>  #ifndef _SEEN_UTILS_H
>  #define _SEEN_UTILS_H 1
>  
> -#include "sql_config.h"
>  #include <stdio.h>  /* FILE* */
>  #include <sys/types.h>   /* time_t */
>  
> 
> 
> ------------------------------------------------------------------------------
> Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT 
> is a gathering of tech-side developers & brand creativity professionals. Meet
> the minds behind Google Creative Lab, Visual Complexity, Processing, & 
> iPhoneDevCamp as they present alongside digital heavyweights like Barbarian 
> Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com 
> _______________________________________________
> Monetdb-sql-checkins mailing list
> Monetdb-sql-checkins at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
> 
> 

-- 
| Dr. Stefan Manegold | mailto:Stefan.Manegold at 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       |




More information about the developers-list mailing list