Update upstream source from tag 'upstream/4.1.4'

Update to upstream version '4.1.4'
with Debian dir 403f575aa88344456029245280a05149f0173f2e

1 files changed, 31 insertions, 24 deletions

diff --git a/src/utils/xb_cfg_check.cpp b/src/utils/xb_cfg_check.cpp
index 5489c51..c979bac 100755
--- a/src/utils/xb_cfg_check.cpp
+++ b/src/utils/xb_cfg_check.cpp
@@ -152,6 +152,13 @@ int main()
     fprintf( stdout, "XB_MDX_SUPPORT          = [OFF]\n" );
   #endif
 
+  #ifdef XB_TDX_SUPPORT
+    fprintf( stdout, "XB_TDX_SUPPORT          = [ON]\n" );
+  #else
+    fprintf( stdout, "XB_TDX_SUPPORT          = [OFF]\n" );
+  #endif
+
+
   #ifdef XB_SQL_SUPPORT
     fprintf( stdout, "XB_SQL_SUPPORT          = [ON]\n" );
   #else
@@ -183,6 +190,7 @@ int main()
   fprintf( stdout, "PROJECT_BINARY_DIR             = [%s]\n",   PROJECT_BINARY_DIR );
   fprintf( stdout, "PROJECT_DATA_DIR               = [%s]\n",   PROJECT_DATA_DIR );
   fprintf( stdout, "PROJECT_LOG_DIR                = [%s]\n",   PROJECT_LOG_DIR );
+  fprintf( stdout, "PROJECT_TEMP_DIR               = [%s]\n",   PROJECT_TEMP_DIR );
   fprintf( stdout, "PROJECT_DFLT_LOGFILE           = [%s]\n",   PROJECT_DFLT_LOGFILE );
   fprintf( stdout, "PROJECT_SOURCE_DIR             = [%s]\n",   PROJECT_SOURCE_DIR );
   fprintf( stdout, "CMAKE_RUNTIME_OUTPUT_DIRECTORY = [%s]\n\n", CMAKE_RUNTIME_OUTPUT_DIRECTORY );
@@ -191,34 +199,33 @@ int main()
   fprintf( stdout, "BUILD_SHARED_LIBS     = [%s]\n",   BUILD_SHARED_LIBS );
   fprintf( stdout, "EXTRA_LIBS            = [%s]\n\n", EXTRA_LIBS );
 
-  fprintf( stdout, "Field sizes:\n" );
-  fprintf( stdout, "SIZEOF_VOID_P         = [%s]\n", CMAKE_SIZEOF_VOID_P );
-  fprintf( stdout, "sizeof(char *)        = [%zd]\n", sizeof( char *));
-  fprintf( stdout, "sizeof(int)           = [%zd]\n", sizeof( int ));
-  fprintf( stdout, "sizeof(long)          = [%zd]\n", sizeof( long ));
-  fprintf( stdout, "sizeof(char)          = [%zd]\n", sizeof( char ));
+
+  fprintf( stdout, "sizeof(char *)        = [%d]\n", (xbInt32) sizeof( char *));
+  fprintf( stdout, "sizeof(int)           = [%d]\n", (xbInt32) sizeof( int ));
+  fprintf( stdout, "sizeof(long)          = [%d]\n", (xbInt32) sizeof( long ));
+  fprintf( stdout, "sizeof(char)          = [%d]\n", (xbInt32) sizeof( char ));
   #ifdef HAVE_WCHAR_H
-  fprintf( stdout, "sizeof(wchar_t)       = [%zd]\n", sizeof( wchar_t ));
+    fprintf( stdout, "sizeof(wchar_t)       = [%d]\n", (xbInt32) sizeof( wchar_t ));
   #endif
 
   #ifdef HAVE_WINDOWS_H
-  fprintf( stdout, "sizeof(DWORD)         = [%zd]\n", sizeof( DWORD ));
-  #endif
-
-  fprintf( stdout, "sizeof(double)        = [%zd]\n", sizeof( double ));
-  fprintf( stdout, "sizeof(float)         = [%zd]\n", sizeof( float ));
-  fprintf( stdout, "sizeof(size_t)        = [%zd]\n", sizeof( size_t ));
-  fprintf( stdout, "sizeof(off_t)         = [%zd]\n\n", sizeof( off_t ));
-
-  fprintf( stdout, "sizeof(xbBool)        = [%zd]\n", sizeof( xbBool ));
-  fprintf( stdout, "sizeof(xbInt16)       = [%zd]\n", sizeof( xbInt16 ));
-  fprintf( stdout, "sizeof(xbUInt16)      = [%zd]\n", sizeof( xbUInt16 ));
-  fprintf( stdout, "sizeof(xbInt32)       = [%zd]\n", sizeof( xbInt32 ));
-  fprintf( stdout, "sizeof(xbUInt32)      = [%zd]\n", sizeof( xbUInt32 ));
-  fprintf( stdout, "sizeof(xbInt64)       = [%zd]\n", sizeof( xbInt64 ));
-  fprintf( stdout, "sizeof(xbUInt64)      = [%zd]\n", sizeof( xbUInt64 ));
-  fprintf( stdout, "sizeof(xbFloat)       = [%zu]\n", sizeof( xbFloat ));
-  fprintf( stdout, "sizeof(xbDouble)      = [%zu]\n", sizeof( xbDouble ));
+    fprintf( stdout, "sizeof(DWORD)         = [%d]\n", (xbInt32) sizeof( DWORD ));
+  #endif
+
+  fprintf( stdout, "sizeof(double)        = [%d]\n", (xbInt32) sizeof( double ));
+  fprintf( stdout, "sizeof(float)         = [%d]\n", (xbInt32)  sizeof( float ));
+  fprintf( stdout, "sizeof(size_t)        = [%d]\n", (xbInt32) sizeof( size_t ));
+  fprintf( stdout, "sizeof(off_t)         = [%d]\n\n", (xbInt32) sizeof( off_t ));
+
+  fprintf( stdout, "sizeof(xbBool)        = [%d]\n", (xbInt32) sizeof( xbBool ));
+  fprintf( stdout, "sizeof(xbInt16)       = [%d]\n", (xbInt32) sizeof( xbInt16 ));
+  fprintf( stdout, "sizeof(xbUInt16)      = [%d]\n", (xbInt32) sizeof( xbUInt16 ));
+  fprintf( stdout, "sizeof(xbInt32)       = [%d]\n", (xbInt32) sizeof( xbInt32 ));
+  fprintf( stdout, "sizeof(xbUInt32)      = [%d]\n", (xbInt32) sizeof( xbUInt32 ));
+  fprintf( stdout, "sizeof(xbInt64)       = [%d]\n", (xbInt32) sizeof( xbInt64 ));
+  fprintf( stdout, "sizeof(xbUInt64)      = [%d]\n", (xbInt32) sizeof( xbUInt64 ));
+  fprintf( stdout, "sizeof(xbFloat)       = [%d]\n", (xbInt32) sizeof( xbFloat ));
+  fprintf( stdout, "sizeof(xbDouble)      = [%d]\n", (xbInt32) sizeof( xbDouble ));
 
 
   fprintf( stdout, "\nHeader files:\n" );