Changeset: faa5a7adf585 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=faa5a7adf585 Modified Files: pathfinder/compiler/include/fmt.h pathfinder/compiler/mem/mem.c pathfinder/compiler/mem/mem_gc.c pathfinder/src/sqlhelpers/xmlshred/include/shred_helper.h Branch: Mar2011 Log Message:
pathfinder: drop fmt.h The defines in fmt.h conflict with monetdb_config.h on Solaris[1]. Since all places where fmt.h is included, monetdb_config.h is included first, fmt.h is no longer of any use, hence drop the file. [1] http://monetdb.cwi.nl/testing/projects/monetdb/testweb/logs/39344:1aea20ca910d/GNU-Solaris-sparcv9/make.html#l4029 diffs (102 lines): diff --git a/pathfinder/compiler/include/fmt.h b/pathfinder/compiler/include/fmt.h deleted file mode 100644 --- a/pathfinder/compiler/include/fmt.h +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Copyright Notice: - * ----------------- - * - * The contents of this file are subject to the Pathfinder 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://monetdb.cwi.nl/Legal/PathfinderLicense-1.1.html - * - * 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 Pathfinder system. - * - * The Original Code has initially been developed by the Database & - * Information Systems Group at the University of Konstanz, Germany and - * the Database Group at the Technische Universitaet Muenchen, Germany. - * It is now maintained by the Database Systems Group at the Eberhard - * Karls Universitaet Tuebingen, Germany. Portions created by the - * University of Konstanz, the Technische Universitaet Muenchen, and the - * Universitaet Tuebingen are Copyright (C) 2000-2005 University of - * Konstanz, (C) 2005-2008 Technische Universitaet Muenchen, and (C) - * 2008-2011 Eberhard Karls Universitaet Tuebingen, respectively. All - * Rights Reserved. - * - * $Id$ - */ - -#ifndef FMT_H -#define FMT_H - -/* define printf formats for printing size_t and ssize_t variables */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901 && !defined(__svr4__) && !defined(WIN32) && !defined(__sgi) && (!defined(__APPLE_CC__) || __GNUC__ > 3) -#define SZFMT "%zu" -#define SSZFMT "%zd" -#elif defined(__MINGW32__) -#define SZFMT "%u" -#define SSZFMT "%ld" -#elif defined(__APPLE_CC__) /* && __GNUC__ <= 3 */ -#define SZFMT "%zu" - #if SIZEOF_SIZE_T == SIZEOF_INT - #define SSZFMT "%d" - #else - #define SSZFMT "%ld" - #endif -#elif SIZEOF_SIZE_T == SIZEOF_INT -#define SZFMT "%u" -#define SSZFMT "%d" -#elif SIZEOF_SIZE_T == SIZEOF_LONG -#define SZFMT "%lu" -#define SSZFMT "%ld" -#elif SIZEOF_SIZE_T == SIZEOF_LONG_LONG || SIZEOF_SIZE_T == SIZEOF___INT64 -#define SZFMT ULLFMT -#define SSZFMT LLFMT -#else -#error no definition for SZFMT/SSZFMT -#endif - -#endif /* FMT_H */ - -/* vim:set shiftwidth=4 expandtab: */ diff --git a/pathfinder/compiler/mem/mem.c b/pathfinder/compiler/mem/mem.c --- a/pathfinder/compiler/mem/mem.c +++ b/pathfinder/compiler/mem/mem.c @@ -48,8 +48,6 @@ #include "oops.h" -#include "fmt.h" - typedef struct PFmem_allocator { size_t size; size_t nr; diff --git a/pathfinder/compiler/mem/mem_gc.c b/pathfinder/compiler/mem/mem_gc.c --- a/pathfinder/compiler/mem/mem_gc.c +++ b/pathfinder/compiler/mem/mem_gc.c @@ -54,7 +54,6 @@ #include "gc.h" #include "mem.h" #include "oops.h" -#include "fmt.h" void PFmem_init(void) diff --git a/pathfinder/src/sqlhelpers/xmlshred/include/shred_helper.h b/pathfinder/src/sqlhelpers/xmlshred/include/shred_helper.h --- a/pathfinder/src/sqlhelpers/xmlshred/include/shred_helper.h +++ b/pathfinder/src/sqlhelpers/xmlshred/include/shred_helper.h @@ -37,7 +37,6 @@ #define STACK_MAX 100 -#include "fmt.h" /* boolean type `bool' and constants `true', `false' */ #ifdef HAVE_STDBOOL_H _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
