refine preprocessor conditionals a bit

.github/workflows/codeql.yml

@@ -73,7 +73,7 @@ jobs:
             sudo apt-get -y install libc6-dev-amd64-cross libgcc-s1-amd64-cross libtbb-dev gobjc gobjc-multilib xutils-dev publib-dev libiberty-dev libc6-dev-i386 libmm-dev
             ;;
           macos*)
-            brew install autoconf gawk util-macros parallel
+            brew install autoconf gawk util-macros libmagic binutils coreutils
             if test -x "$(which mdutil)"; then \
               sudo mdutil -a -i off; \
             fi

argp/argp-standalone-1.3/argp.h

@@ -563,9 +563,10 @@ __argp_short_program_name(const struct argp_state *state) __THROW;
 # ifndef ARGP_EI
 /* in case __inline__ is defined as a macro to be an attribute, force it to be
  * a keyword instead: */
-#  if defined(__inline__) && defined(__GNUC__) && defined(HAVE_INLINE)
+#  if defined(__inline__) && defined(__GNUC__) && \
+      (defined(HAVE_INLINE) || !defined(__NO_INLINE__))
 #   undef __inline__
-#  endif /* __inline__ && __GNUC__ && HAVE_INLINE */
+#  endif /* __inline__ && __GNUC__ && (HAVE_INLINE || !__NO_INLINE__) */
 #  define ARGP_EI extern __inline__
 # endif /* !ARGP_EI */
 

configure.ac

@@ -233,8 +233,9 @@ if test "x${ac_cv_search_CFPreferencesCopyAppValue}y" != "xnoy"; then
   AC_DEFINE([CFPREFERENCESCOPYAPPVALUE_OK_TO_LINK],[1],
     [Define to 1 if we are ok to link w/a library for CFPreferencesCopyAppValue])
 fi
-AC_SEARCH_LIBS([__fpending],[c System magic pub gnu iberty])
-AC_SEARCH_LIBS([dupfd],[c System magic pub gnu iberty])dnl
+AC_SEARCH_LIBS([__fpending],[c System magic pub gnu iberty fpending]) ## (ok)
+AC_SEARCH_LIBS([chdir-long],[c System magic pub gnu iberty chdir]) ## (newline)
+AC_SEARCH_LIBS([dupfd],[c System magic pub gnu iberty dup dupfd])dnl
 
 # Threading.
 AC_MSG_CHECKING([for threading library characteristics...])

fflush.c

@@ -46,7 +46,9 @@
 #undef fflush
 
 
-#if defined(_IO_EOF_SEEN) || defined(_IO_ftrylockfile) || (defined(__GNU_LIBRARY__) && (__GNU_LIBRARY__ == 1))
+#if (defined(_IO_EOF_SEEN) && defined(_IO_IN_BACKUP)) || \
+    (defined(_IO_ftrylockfile) && defined(_IO_IN_BACKUP)) || \
+    (defined(__GNU_LIBRARY__) && (__GNU_LIBRARY__ == 1))
 /* GNU libc, BeOS, Haiku, Linux libc5 */
 
 /* Clear the stream's ungetc buffer, preserving the value of ftello (fp): */

libUnixToOSX.xcodeproj/project.pbxproj

@@ -559,6 +559,8 @@
 		A530AE992C2FFC9500F48BE3 /* brk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = brk.c; sourceTree = "<group>"; };
 		A530AE9B2C3052DD00F48BE3 /* crypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt.c; sourceTree = "<group>"; };
 		A530AE9D2C305ED600F48BE3 /* memrchr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memrchr.h; sourceTree = "<group>"; };
+		A530AEA02C30752900F48BE3 /* FUNDING.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = FUNDING.yml; sourceTree = "<group>"; };
+		A530AEA22C30752900F48BE3 /* codeql.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = codeql.yml; sourceTree = "<group>"; };
 		A531665E18EEF26F0049B90F /* dup2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dup2.c; sourceTree = "<group>"; };
 		A531665F18EEF26F0049B90F /* dup3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dup3.c; sourceTree = "<group>"; };
 		A531667218EEF3D00049B90F /* dup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dup.c; sourceTree = "<group>"; };
@@ -699,6 +701,7 @@
 		08FB7794FE84155DC02AAC07 /* libUnixToOSX */ = {
 			isa = PBXGroup;
 			children = (
+				A530AE9F2C30752900F48BE3 /* .github */,
 				A50A8FED18ED999E0096B616 /* snippet */,
 				08FB7795FE84155DC02AAC07 /* Source */,
 				A5A266871916B84C00EEBBC2 /* Resources */,
@@ -1013,6 +1016,23 @@
 			name = "Linked Frameworks";
 			sourceTree = "<group>";
 		};
+		A530AE9F2C30752900F48BE3 /* .github */ = {
+			isa = PBXGroup;
+			children = (
+				A530AEA02C30752900F48BE3 /* FUNDING.yml */,
+				A530AEA12C30752900F48BE3 /* workflows */,
+			);
+			path = .github;
+			sourceTree = "<group>";
+		};
+		A530AEA12C30752900F48BE3 /* workflows */ = {
+			isa = PBXGroup;
+			children = (
+				A530AEA22C30752900F48BE3 /* codeql.yml */,
+			);
+			path = workflows;
+			sourceTree = "<group>";
+		};
 		A558DC9019005655002696E8 /* libftw0 */ = {
 			isa = PBXGroup;
 			children = (