From 61d23059b387662863507355e37712a3f4edca44 Mon Sep 17 00:00:00 2001 From: David Declerck Date: Fri, 12 Jul 2024 18:32:35 +0200 Subject: [PATCH] Merge SVN 4724, 4725, 4726 --- build_windows/ChangeLog.txt | 6 ++++++ build_windows/vs2008/cobc.vcproj | 16 ++++++++++------ build_windows/vs2010/cobc.vcxproj | 2 ++ build_windows/vs2010/cobc.vcxproj.filters | 6 ++++++ build_windows/vs2012/cobc.vcxproj | 2 ++ build_windows/vs2012/cobc.vcxproj.filters | 6 ++++++ build_windows/vs2013/cobc.vcxproj | 2 ++ build_windows/vs2013/cobc.vcxproj.filters | 6 ++++++ build_windows/vs2015/cobc.vcxproj | 2 ++ build_windows/vs2015/cobc.vcxproj.filters | 6 ++++++ build_windows/vs2017/cobc.vcxproj | 2 ++ build_windows/vs2017/cobc.vcxproj.filters | 6 ++++++ build_windows/vs2019/cobc.vcxproj | 2 ++ build_windows/vs2019/cobc.vcxproj.filters | 6 ++++++ cobc/cconv.c | 10 ++++++---- cobc/cconv.h | 5 ++--- cobc/cobc.h | 2 -- cobc/codegen.c | 1 + 18 files changed, 73 insertions(+), 15 deletions(-) diff --git a/build_windows/ChangeLog.txt b/build_windows/ChangeLog.txt index 3510a5a5b..b3161d1e2 100644 --- a/build_windows/ChangeLog.txt +++ b/build_windows/ChangeLog.txt @@ -12,6 +12,12 @@ preventing resource compilers to stumble over C definitions * makedist.cmd: cater for new header files +2022-10-01 Simon Sobisch + + * general for cobc: include new cconv module; + for cobc.vcxproj: add gcos to auxiliary compiler files; + for cobc.vcproj: have auxiliary compiler files included + 2022-01-03 Simon Sobisch * general: project files - only include "build_windows" and top_srcdir; diff --git a/build_windows/vs2008/cobc.vcproj b/build_windows/vs2008/cobc.vcproj index 53b03d653..9abbf9bb2 100644 --- a/build_windows/vs2008/cobc.vcproj +++ b/build_windows/vs2008/cobc.vcproj @@ -183,6 +183,10 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > + + @@ -333,6 +337,10 @@ Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > + + @@ -354,11 +362,7 @@ > - - + @@ -332,6 +333,7 @@ + diff --git a/build_windows/vs2010/cobc.vcxproj.filters b/build_windows/vs2010/cobc.vcxproj.filters index 732e84b6f..5c4a0710c 100644 --- a/build_windows/vs2010/cobc.vcxproj.filters +++ b/build_windows/vs2010/cobc.vcxproj.filters @@ -36,6 +36,9 @@ Source Files + + Source Files + Source Files @@ -248,6 +251,9 @@ Header Files + + Header Files + Header Files diff --git a/build_windows/vs2012/cobc.vcxproj b/build_windows/vs2012/cobc.vcxproj index 6169e8f51..06388387c 100644 --- a/build_windows/vs2012/cobc.vcxproj +++ b/build_windows/vs2012/cobc.vcxproj @@ -191,6 +191,7 @@ + @@ -336,6 +337,7 @@ + diff --git a/build_windows/vs2012/cobc.vcxproj.filters b/build_windows/vs2012/cobc.vcxproj.filters index 732e84b6f..5c4a0710c 100644 --- a/build_windows/vs2012/cobc.vcxproj.filters +++ b/build_windows/vs2012/cobc.vcxproj.filters @@ -36,6 +36,9 @@ Source Files + + Source Files + Source Files @@ -248,6 +251,9 @@ Header Files + + Header Files + Header Files diff --git a/build_windows/vs2013/cobc.vcxproj b/build_windows/vs2013/cobc.vcxproj index 303b4dc18..599b95a7e 100644 --- a/build_windows/vs2013/cobc.vcxproj +++ b/build_windows/vs2013/cobc.vcxproj @@ -193,6 +193,7 @@ + @@ -338,6 +339,7 @@ + diff --git a/build_windows/vs2013/cobc.vcxproj.filters b/build_windows/vs2013/cobc.vcxproj.filters index 732e84b6f..5c4a0710c 100644 --- a/build_windows/vs2013/cobc.vcxproj.filters +++ b/build_windows/vs2013/cobc.vcxproj.filters @@ -36,6 +36,9 @@ Source Files + + Source Files + Source Files @@ -248,6 +251,9 @@ Header Files + + Header Files + Header Files diff --git a/build_windows/vs2015/cobc.vcxproj b/build_windows/vs2015/cobc.vcxproj index 45190313f..94faa9985 100644 --- a/build_windows/vs2015/cobc.vcxproj +++ b/build_windows/vs2015/cobc.vcxproj @@ -191,6 +191,7 @@ + @@ -336,6 +337,7 @@ + diff --git a/build_windows/vs2015/cobc.vcxproj.filters b/build_windows/vs2015/cobc.vcxproj.filters index 3bb3682aa..14274780e 100644 --- a/build_windows/vs2015/cobc.vcxproj.filters +++ b/build_windows/vs2015/cobc.vcxproj.filters @@ -36,6 +36,9 @@ Source Files + + Source Files + Source Files @@ -248,6 +251,9 @@ Header Files + + Header Files + Header Files diff --git a/build_windows/vs2017/cobc.vcxproj b/build_windows/vs2017/cobc.vcxproj index e7a1f930c..3d07ba3dd 100644 --- a/build_windows/vs2017/cobc.vcxproj +++ b/build_windows/vs2017/cobc.vcxproj @@ -193,6 +193,7 @@ + @@ -338,6 +339,7 @@ + diff --git a/build_windows/vs2017/cobc.vcxproj.filters b/build_windows/vs2017/cobc.vcxproj.filters index 3bb3682aa..14274780e 100644 --- a/build_windows/vs2017/cobc.vcxproj.filters +++ b/build_windows/vs2017/cobc.vcxproj.filters @@ -36,6 +36,9 @@ Source Files + + Source Files + Source Files @@ -248,6 +251,9 @@ Header Files + + Header Files + Header Files diff --git a/build_windows/vs2019/cobc.vcxproj b/build_windows/vs2019/cobc.vcxproj index 7b6d60932..ed90788b7 100644 --- a/build_windows/vs2019/cobc.vcxproj +++ b/build_windows/vs2019/cobc.vcxproj @@ -193,6 +193,7 @@ + @@ -338,6 +339,7 @@ + diff --git a/build_windows/vs2019/cobc.vcxproj.filters b/build_windows/vs2019/cobc.vcxproj.filters index 3bb3682aa..14274780e 100644 --- a/build_windows/vs2019/cobc.vcxproj.filters +++ b/build_windows/vs2019/cobc.vcxproj.filters @@ -36,6 +36,9 @@ Source Files + + Source Files + Source Files @@ -248,6 +251,9 @@ Header Files + + Header Files + Header Files diff --git a/cobc/cconv.c b/cobc/cconv.c index 865636fcf..04048424d 100644 --- a/cobc/cconv.c +++ b/cobc/cconv.c @@ -1,7 +1,6 @@ /* - Copyright (C) 2022 Free Software Foundation, Inc. Written by Keisuke - Nishida, Roger While, Simon Sobisch, Edwart Hart, Ron Norman, Nicolas - Berthier + Copyright (C) 2005,2006,2022 Free Software Foundation, Inc. + Written by Roger While, Nicolas Berthier, Simon Sobisch This file is part of GnuCOBOL. @@ -18,8 +17,11 @@ You should have received a copy of the GNU General Public License along with GnuCOBOL. If not, see . */ -#include "cconv.h" + +#include /* for FILE, used in cobc.h */ + #include "cobc.h" /* for cb_strcasecmp */ +#include "cconv.h" /* TODO: Maybe use iconv or gconv before extending to other character sets while using standard naming scheme? Note, however, that specifications for GCOS7 diff --git a/cobc/cconv.h b/cobc/cconv.h index bb81160ec..3bee1739f 100644 --- a/cobc/cconv.h +++ b/cobc/cconv.h @@ -1,7 +1,6 @@ /* - Copyright (C) 2022 Free Software Foundation, Inc. Written by Keisuke - Nishida, Roger While, Simon Sobisch, Edwart Hart, Ron Norman, Nicolas - Berthier + Copyright (C) 2005,2006,2022 Free Software Foundation, Inc. + Written by Roger While, Nicolas Berthier, Simon Sobisch This file is part of GnuCOBOL. diff --git a/cobc/cobc.h b/cobc/cobc.h index 3c4f8e23d..6efbe2700 100644 --- a/cobc/cobc.h +++ b/cobc/cobc.h @@ -29,10 +29,8 @@ #ifdef HAVE_UNISTD_H #include #endif -#include /* for FILE */ #include "../libcob/common.h" -#include "cconv.h" #ifdef ENABLE_NLS #include "../lib/gettext.h" diff --git a/cobc/codegen.c b/cobc/codegen.c index 73b71aac9..7d3d6ca9f 100644 --- a/cobc/codegen.c +++ b/cobc/codegen.c @@ -37,6 +37,7 @@ #include "cobc.h" #include "tree.h" +#include "cconv.h" #if !defined(COB_ALIGN_KNOWN) && !defined(COB_ALLOW_UNALIGNED) #error System requires data alignment which is unknown