From 8a58275ca2eb6229d6ce0e4776594e2a96148acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trung=20L=C3=AA?= <8@tle.id.au> Date: Thu, 29 Jan 2026 22:17:42 +1100 Subject: [PATCH] Fix C11 compilation compatibility in dtinfo - Add TRUE/FALSE macro definitions to FolioObject.hh and List.hh to ensure they are defined before use with C11 standard - Fix config.h include paths in DtSR_BookcaseEntry.C and DtSR_SearchResultsEntry.C to use relative path ../../config.h so ON_DEBUG and ISSPACE_C macros are available --- cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh | 7 +++++++ cde/programs/dtinfo/dtinfo/src/Basic/List.hh | 7 +++++++ .../dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C | 3 ++- .../dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C | 4 +++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh b/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh index cd1ce6838..e395592fc 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh +++ b/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh @@ -44,6 +44,13 @@ * */ +#ifndef TRUE +#define TRUE 1 +#endif +#ifndef FALSE +#define FALSE 0 +#endif + // Base Object for ALL Folio Objects class Dependent; diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/List.hh b/cde/programs/dtinfo/dtinfo/src/Basic/List.hh index 262a7ae7b..f0abffb63 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/List.hh +++ b/cde/programs/dtinfo/dtinfo/src/Basic/List.hh @@ -40,6 +40,13 @@ * 1315 Dell Avenue, Campbell, CA 95008 * */ +#ifndef TRUE +#define TRUE 1 +#endif +#ifndef FALSE +#define FALSE 0 +#endif + diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C index 0d40fe4ec..cf976a18f 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C @@ -24,13 +24,14 @@ /* Copyright (c) 1995,1996 FUJITSU LIMITED */ /* All Rights Reserved */ +#include "../../config.h" #include #include #include using namespace std; -#include "config.h" +#include "../../config.h" #include "Basic/Error.hh" #include "Basic/FolioObject.hh" #include "Basic/List.hh" diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C index ea4b413df..ef1fb44a3 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C @@ -24,6 +24,8 @@ /* Copyright (c) 1995,1996 FUJITSU LIMITED */ /* All Rights Reserved */ +#include "../../config.h" + #include #include #include @@ -35,7 +37,7 @@ #include #include "Tml_TextRenderer.hh" -#include "config.h" +#include "../../config.h" #include "Basic/Error.hh" #include "Basic/FolioObject.hh" #include "Basic/List.hh"