[OMPT-svn-commit] OpenMPT r21684 - trunk/OpenMPT/openmpt123

[<sv...@op...>]

Author: manx
Date: Sun Sep 22 16:33:38 2024
New Revision: 21684
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21684

Log:
[Ref] openmpt123: Move IsConsole and IsTerminal.

Modified:
   trunk/OpenMPT/openmpt123/openmpt123.cpp
   trunk/OpenMPT/openmpt123/openmpt123.hpp

Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp
==============================================================================
--- trunk/OpenMPT/openmpt123/openmpt123.cpp	Sun Sep 22 16:31:49 2024	(r21683)
+++ trunk/OpenMPT/openmpt123/openmpt123.cpp	Sun Sep 22 16:33:38 2024	(r21684)
@@ -152,37 +152,6 @@
 
 constexpr auto libopenmpt_encoding = mpt::common_encoding::utf8;
 
-#if MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10)
-bool IsConsole( DWORD stdHandle ) {
-	HANDLE hStd = GetStdHandle( stdHandle );
-	if ( ( hStd != NULL ) && ( hStd != INVALID_HANDLE_VALUE ) ) {
-		DWORD mode = 0;
-		if ( GetConsoleMode( hStd, &mode ) != FALSE ) {
-			return true;
-		}
-	}
-	return false;
-}
-#endif // MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10)
-
-bool IsTerminal( int fd ) {
-#if MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10)
-	if ( !_isatty( fd ) ) {
-		return false;
-	}
-	DWORD stdHandle = 0;
-	if ( fd == 0 ) {
-		stdHandle = STD_INPUT_HANDLE;
-	} else if ( fd == 1 ) {
-		stdHandle = STD_OUTPUT_HANDLE;
-	} else if ( fd == 2 ) {
-		stdHandle = STD_ERROR_HANDLE;
-	}
-	return IsConsole( stdHandle );
-#else
-	return isatty( fd ) ? true : false;
-#endif
-}
 
 #if !MPT_OS_WINDOWS
 

Modified: trunk/OpenMPT/openmpt123/openmpt123.hpp
==============================================================================
--- trunk/OpenMPT/openmpt123/openmpt123.hpp	Sun Sep 22 16:31:49 2024	(r21683)
+++ trunk/OpenMPT/openmpt123/openmpt123.hpp	Sun Sep 22 16:33:38 2024	(r21684)
@@ -141,9 +141,36 @@
 
 
 #if MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10)
-bool IsConsole( DWORD stdHandle );
+inline bool IsConsole( DWORD stdHandle ) {
+	HANDLE hStd = GetStdHandle( stdHandle );
+	if ( ( hStd != NULL ) && ( hStd != INVALID_HANDLE_VALUE ) ) {
+		DWORD mode = 0;
+		if ( GetConsoleMode( hStd, &mode ) != FALSE ) {
+			return true;
+		}
+	}
+	return false;
+}
+#endif // MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10)
+
+inline bool IsTerminal( int fd ) {
+#if MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10)
+	if ( !_isatty( fd ) ) {
+		return false;
+	}
+	DWORD stdHandle = 0;
+	if ( fd == 0 ) {
+		stdHandle = STD_INPUT_HANDLE;
+	} else if ( fd == 1 ) {
+		stdHandle = STD_OUTPUT_HANDLE;
+	} else if ( fd == 2 ) {
+		stdHandle = STD_ERROR_HANDLE;
+	}
+	return IsConsole( stdHandle );
+#else
+	return isatty( fd ) ? true : false;
 #endif
-bool IsTerminal( int fd );
+}
 
 
 class textout : public string_concat_stream<mpt::ustring> {