fixed #13375/refs #10543 - consistently do *not* use GNU extensions in builds / avoid legacy standard aliases / Cygwin-related cleanups (danmar#7067)

Author: firewave

.github/workflows/CI-cygwin.yml

@@ -20,11 +20,12 @@ defaults:
     shell: cmd
 
 jobs:
+  # TODO: add CMake build
   build_cygwin:
     strategy:
       matrix:
         os: [windows-2022]
-        arch: [x64]
+        platform: [x86_64]
         include:
           - platform: 'x86_64'
             packages: |
@@ -42,7 +43,7 @@ jobs:
       - name: Set up Cygwin
         uses: cygwin/cygwin-install-action@master
         with:
-          platform: ${{ matrix.arch }}
+          platform: ${{ matrix.platform }}
           packages: ${{ matrix.packages }}
 
       # Cygwin will always link the binaries even if they already exist. The linking is also extremely slow. So just run the "check" target which includes all the binaries.

.github/workflows/CI-mingw.yml

@@ -20,6 +20,7 @@ defaults:
     shell: msys2 {0}
 
 jobs:
+  # TODO: add CMake build
   build_mingw:
     strategy:
       matrix:

CMakeLists.txt

@@ -9,6 +9,7 @@ include(cmake/options.cmake)
 include(cmake/cxx11.cmake)
 use_cxx11()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 

Makefile

@@ -120,10 +120,6 @@ ifdef CYGWIN
         $(info CYGWIN found)
     endif
 
-    # Set the flag to address compile time warnings
-    # with tinyxml2 and Cygwin.
-    CPPFLAGS+=-U__STRICT_ANSI__
-    
     # Increase stack size for Cygwin builds to avoid segmentation fault in limited recursive tests.
     CXXFLAGS+=-Wl,--stack,8388608
 endif # CYGWIN
@@ -140,15 +136,9 @@ ifndef CXXFLAGS
 endif
 
 ifeq (g++, $(findstring g++,$(CXX)))
-    override CXXFLAGS += -std=gnu++0x -pipe
-else ifeq (clang++, $(findstring clang++,$(CXX)))
-    override CXXFLAGS += -std=c++0x
-else ifeq ($(CXX), c++)
-    ifeq ($(shell uname -s), Darwin)
-        override CXXFLAGS += -std=c++0x
-    endif
+    override CXXFLAGS += -pipe
 endif
-
+override CXXFLAGS += -std=c++11
 ifeq ($(HAVE_RULES),yes)
     PCRE_CONFIG = $(shell which pcre-config)
     ifeq ($(PCRE_CONFIG),)
@@ -918,7 +908,7 @@ externals/simplecpp/simplecpp.o: externals/simplecpp/simplecpp.cpp externals/sim
 	$(CXX)  $(CPPFLAGS) $(CXXFLAGS) -w -c -o $@ externals/simplecpp/simplecpp.cpp
 
 externals/tinyxml2/tinyxml2.o: externals/tinyxml2/tinyxml2.cpp externals/tinyxml2/tinyxml2.h
-	$(CXX)  $(CPPFLAGS) $(CXXFLAGS) -w -c -o $@ externals/tinyxml2/tinyxml2.cpp
+	$(CXX)  $(CPPFLAGS) $(CXXFLAGS) -w -D_LARGEFILE_SOURCE -c -o $@ externals/tinyxml2/tinyxml2.cpp
 
 tools/dmake/dmake.o: tools/dmake/dmake.cpp cli/filelister.h lib/config.h lib/filesettings.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ tools/dmake/dmake.cpp

cli/cppcheckexecutor.cpp

@@ -16,6 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if defined(__CYGWIN__)
+#define _BSD_SOURCE // required to have popen() and pclose()
+#endif
+
 #include "cppcheckexecutor.h"
 
 #include "analyzerinfo.h"

cli/filelister.cpp

@@ -16,6 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if defined(__CYGWIN__)
+#define _BSD_SOURCE // required to have DT_DIR and DT_UNKNOWN
+#endif
+
 #include "filelister.h"
 
 #include "filesettings.h"
@@ -169,10 +173,6 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
 ////// This code is POSIX-style systems ///////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__CYGWIN__)
-#undef __STRICT_ANSI__
-#endif
-
 #include <dirent.h>
 #include <sys/stat.h>
 #include <cerrno>
@@ -216,7 +216,7 @@ static std::string addFiles2(std::list<FileWithDetails> &files,
         new_path.erase(path.length() + 1);
         new_path += dir_result->d_name;
 
-#if defined(_DIRENT_HAVE_D_TYPE) || defined(_BSD_SOURCE)
+#if defined(_DIRENT_HAVE_D_TYPE)
         const bool path_is_directory = (dir_result->d_type == DT_DIR || (dir_result->d_type == DT_UNKNOWN && Path::isDirectory(new_path)));
 #else
         const bool path_is_directory = Path::isDirectory(new_path);

cli/processexecutor.cpp

@@ -16,6 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if defined(__CYGWIN__)
+#define _BSD_SOURCE // required to have getloadavg()
+#endif
+
 #include "processexecutor.h"
 
 #if !defined(WIN32) && !defined(__MINGW32__)

cli/signalhandler.cpp

@@ -16,6 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if defined(__CYGWIN__)
+#define _BSD_SOURCE // required to have siginfo_t, SIGSTKSZ, kill(), sigaction and others
+#endif
+
 #include "signalhandler.h"
 
 #if defined(USE_UNIX_SIGNAL_HANDLING)

externals/tinyxml2/CMakeLists.txt

@@ -19,4 +19,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     target_compile_options_safe(tinyxml2_objs -Wno-inconsistent-missing-destructor-override)
     target_compile_options_safe(tinyxml2_objs -Wno-format)
 endif()
+if(CYGWIN)
+    target_compile_definitions(-D_LARGEFILE_SOURCE)  # required for fseeko() and ftello()
+endif()
 

lib/path.cpp

@@ -16,12 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if defined(__GNUC__) && (defined(_WIN32) || defined(__CYGWIN__))
-#undef __STRICT_ANSI__
-#endif
-
 //#define LOG_EMACS_MARKER
 
+#if defined(__CYGWIN__)
+#define _POSIX_C_SOURCE 200112L // required to have readlink()
+#define _BSD_SOURCE // required to have realpath()
+#endif
+
 #include "path.h"
 #include "utils.h"