From 1fe7d71cf130074f2b345ebe70f9e76e8899b072 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sun, 16 Apr 2023 23:53:33 +0200 Subject: Introduce ledger.hh --- src/global.h | 1 + src/ledger.hh.in | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/ptree.cc | 2 +- src/system.hh.in | 32 ------------------------- src/utils.cc | 2 +- 5 files changed, 76 insertions(+), 34 deletions(-) create mode 100644 src/ledger.hh.in (limited to 'src') diff --git a/src/global.h b/src/global.h index 9607ba1a..4892a471 100644 --- a/src/global.h +++ b/src/global.h @@ -37,6 +37,7 @@ */ #pragma once +#include #include "option.h" #include "report.h" diff --git a/src/ledger.hh.in b/src/ledger.hh.in new file mode 100644 index 00000000..f0bb610f --- /dev/null +++ b/src/ledger.hh.in @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2003-2023, John Wiegley. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of New Artisans LLC nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @addtogroup util + * + * @file ledger.hh + * @author John Wiegley + */ +#pragma once + +#include + +#define Ledger_VERSION_MAJOR @Ledger_VERSION_MAJOR@ +#define Ledger_VERSION_MINOR @Ledger_VERSION_MINOR@ +#define Ledger_VERSION_PATCH @Ledger_VERSION_PATCH@ +#define Ledger_VERSION_PRERELEASE "@Ledger_VERSION_PRERELEASE@" +#define Ledger_VERSION_DATE @Ledger_VERSION_DATE@ + +/** + * @name Default values + */ +/*@{*/ + +#if DEBUG_MODE +#define DEBUG_ON 1 +#define VERIFY_ON 1 +#define TRACING_ON 1 +#elif NO_ASSERTS +#define DEBUG_ON 0 +#define VERIFY_ON 0 +#define TRACING_ON 0 +#else +#define DEBUG_ON 0 +#define VERIFY_ON 0 +#define TRACING_ON 1 // use --trace X to enable +#endif + +#define LOGGING_ON 1 + +#define DOCUMENT_MODEL 0 +#define REDUCE_TO_INTEGER 0 + +/*@}*/ + diff --git a/src/ptree.cc b/src/ptree.cc index 01bf16b0..dc1d7f3d 100644 --- a/src/ptree.cc +++ b/src/ptree.cc @@ -29,7 +29,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "ptree.h" #include "xact.h" diff --git a/src/system.hh.in b/src/system.hh.in index 52c8a706..1167885d 100644 --- a/src/system.hh.in +++ b/src/system.hh.in @@ -49,12 +49,6 @@ /* Application configuration */ /*------------------------------------------------------------------------*/ -#define Ledger_VERSION_MAJOR @Ledger_VERSION_MAJOR@ -#define Ledger_VERSION_MINOR @Ledger_VERSION_MINOR@ -#define Ledger_VERSION_PATCH @Ledger_VERSION_PATCH@ -#define Ledger_VERSION_PRERELEASE "@Ledger_VERSION_PRERELEASE@" -#define Ledger_VERSION_DATE @Ledger_VERSION_DATE@ - #cmakedefine01 HAVE_GETTEXT #cmakedefine01 HAVE_EDIT @@ -73,32 +67,6 @@ #cmakedefine01 DEBUG_MODE #cmakedefine01 NO_ASSERTS -/** - * @name Default values - */ -/*@{*/ - -#if DEBUG_MODE -#define DEBUG_ON 1 -#define VERIFY_ON 1 -#define TRACING_ON 1 -#elif NO_ASSERTS -#define DEBUG_ON 0 -#define VERIFY_ON 0 -#define TRACING_ON 0 -#else -#define DEBUG_ON 0 -#define VERIFY_ON 0 -#define TRACING_ON 1 // use --trace X to enable -#endif - -#define LOGGING_ON 1 - -/*@}*/ - -#define DOCUMENT_MODEL 0 -#define REDUCE_TO_INTEGER 0 - /*------------------------------------------------------------------------*/ /* System includes */ /*------------------------------------------------------------------------*/ diff --git a/src/utils.cc b/src/utils.cc index 955b5a7f..6ca7eeb7 100644 --- a/src/utils.cc +++ b/src/utils.cc @@ -29,7 +29,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "times.h" -- cgit v1.2.3