slirp, Visual Studio Projects: Adjust includes to allow building with Visual Studio Community

This commit is contained in:
Mark Pizzolato 2015-10-16 11:37:30 -07:00
parent 5c117caaed
commit ed3e9a15b0
26 changed files with 346 additions and 327 deletions

View file

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.3/include&quot;;&quot;../../windows-build/PCRE/include&quot;;&quot;../../windows-build/libpng-1.6.18&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.3/include&quot;;&quot;../../windows-build/PCRE/include&quot;;&quot;../../windows-build/libpng-1.6.18&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_610;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;USE_SIM_VIDEO;HAVE_LIBSDL;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_LIBPNG;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_610;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;USE_SIM_VIDEO;HAVE_LIBSDL;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_LIBPNG;HAVE_SLIRP_NETWORK"
KeepComments="false" KeepComments="false"
MinimalRebuild="true" MinimalRebuild="true"
@ -128,7 +128,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.3/include&quot;;&quot;../../windows-build/PCRE/include&quot;;&quot;../../windows-build/libpng-1.6.18&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.3/include&quot;;&quot;../../windows-build/PCRE/include&quot;;&quot;../../windows-build/libpng-1.6.18&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_610;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;USE_SIM_VIDEO;HAVE_LIBSDL;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_LIBPNG;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_610;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;USE_SIM_VIDEO;HAVE_LIBSDL;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_LIBPNG;HAVE_SLIRP_NETWORK"
KeepComments="false" KeepComments="false"
StringPooling="true" StringPooling="true"

View file

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.3/include&quot;;&quot;../../windows-build/PCRE/include&quot;;&quot;../../windows-build/libpng-1.6.18&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.3/include&quot;;&quot;../../windows-build/PCRE/include&quot;;&quot;../../windows-build/libpng-1.6.18&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_630;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;USE_SIM_VIDEO;HAVE_LIBSDL;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_LIBPNG;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_630;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;USE_SIM_VIDEO;HAVE_LIBSDL;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_LIBPNG;HAVE_SLIRP_NETWORK"
KeepComments="false" KeepComments="false"
MinimalRebuild="true" MinimalRebuild="true"
@ -128,7 +128,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.3/include&quot;;&quot;../../windows-build/PCRE/include&quot;;&quot;../../windows-build/libpng-1.6.18&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.3/include&quot;;&quot;../../windows-build/PCRE/include&quot;;&quot;../../windows-build/libpng-1.6.18&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_630;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;USE_SIM_VIDEO;HAVE_LIBSDL;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_LIBPNG;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_630;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;USE_SIM_VIDEO;HAVE_LIBSDL;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_LIBPNG;HAVE_SLIRP_NETWORK"
KeepComments="false" KeepComments="false"
StringPooling="true" StringPooling="true"

View file

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="./;../;../PDP11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../PDP11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_SHARED;USE_DISPLAY;VM_PDP11;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;SIM_ASYNCH_IO;USE_READER_THREAD;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_SHARED;USE_DISPLAY;VM_PDP11;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;SIM_ASYNCH_IO;USE_READER_THREAD;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK"
KeepComments="false" KeepComments="false"
MinimalRebuild="true" MinimalRebuild="true"
@ -125,7 +125,7 @@
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OmitFramePointers="true" OmitFramePointers="true"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="./;../;../PDP11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../PDP11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_SHARED;USE_DISPLAY;VM_PDP11;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;SIM_ASYNCH_IO;USE_READER_THREAD;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_SHARED;USE_DISPLAY;VM_PDP11;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;SIM_ASYNCH_IO;USE_READER_THREAD;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"

View file

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.3/include&quot;;&quot;../../windows-build/PCRE/include&quot;;&quot;../../windows-build/libpng-1.6.18&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.3/include&quot;;&quot;../../windows-build/PCRE/include&quot;;&quot;../../windows-build/libpng-1.6.18&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;USE_SIM_VIDEO;HAVE_LIBSDL;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_LIBPNG;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;USE_SIM_VIDEO;HAVE_LIBSDL;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_LIBPNG;HAVE_SLIRP_NETWORK"
KeepComments="false" KeepComments="false"
MinimalRebuild="true" MinimalRebuild="true"
@ -130,7 +130,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.3/include&quot;;&quot;../../windows-build/PCRE/include&quot;;&quot;../../windows-build/libpng-1.6.18&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.3/include&quot;;&quot;../../windows-build/PCRE/include&quot;;&quot;../../windows-build/libpng-1.6.18&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;USE_SIM_VIDEO;HAVE_LIBSDL;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_LIBPNG;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;USE_SIM_VIDEO;HAVE_LIBSDL;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_LIBPNG;HAVE_SLIRP_NETWORK"
KeepComments="false" KeepComments="false"
StringPooling="true" StringPooling="true"

View file

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_730;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_730;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
@ -127,7 +127,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_730;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_730;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"

View file

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_750;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_750;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
@ -127,7 +127,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_750;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_750;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"

View file

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_780;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_780;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
@ -127,7 +127,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_780;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_780;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"

View file

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_860;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_860;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
@ -127,7 +127,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_860;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_860;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"

View file

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_620;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_620;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK"
KeepComments="false" KeepComments="false"
MinimalRebuild="true" MinimalRebuild="true"
@ -128,7 +128,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32" AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/PCRE/include/&quot;;&quot;../../windows-build/pthreads&quot;;../slirp;../slirp/simh;../slirp/simh/qemu;../slirp/simh/qemu/win32/include"
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_620;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK" PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_620;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC;HAVE_SLIRP_NETWORK"
KeepComments="false" KeepComments="false"
StringPooling="true" StringPooling="true"

View file

@ -1,7 +1,9 @@
#ifndef CONFIG_HOST_H #ifndef CONFIG_HOST_H
#define CONFIG_HOST_H #define CONFIG_HOST_H
#include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#include <winsock2.h> #include <winsock2.h>
#else #else
@ -9,7 +11,11 @@ typedef int SOCKET;
#endif #endif
typedef int bool; typedef int bool;
#ifdef _MSC_VER
#include <win32/stdint.h>
#else
#include <stdint.h> #include <stdint.h>
#endif
#include <sockets.h> #include <sockets.h>
#define qemu_add_child_watch(pid) #define qemu_add_child_watch(pid)
int qemu_setsockopt (int s, int level, int optname, void *optval, int optlen); int qemu_setsockopt (int s, int level, int optname, void *optval, int optlen);

View file

@ -24,7 +24,11 @@
#ifndef BLOCK_ACCOUNTING_H #ifndef BLOCK_ACCOUNTING_H
#define BLOCK_ACCOUNTING_H #define BLOCK_ACCOUNTING_H
#ifdef _MSC_VER
#include <win32/stdint.h>
#else
#include <stdint.h> #include <stdint.h>
#endif
#include "qemu/typedefs.h" #include "qemu/typedefs.h"

View file

@ -15,7 +15,6 @@
#ifndef QEMU_COROUTINE_H #ifndef QEMU_COROUTINE_H
#define QEMU_COROUTINE_H #define QEMU_COROUTINE_H
#include <stdbool.h>
#include "qemu/typedefs.h" #include "qemu/typedefs.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qemu/timer.h" #include "qemu/timer.h"

View file

@ -14,7 +14,6 @@
#define QEMU_ERROR_H #define QEMU_ERROR_H
#include <stdarg.h> #include <stdarg.h>
#include <stdbool.h>
#include "qemu/compiler.h" #include "qemu/compiler.h"
typedef struct Location { typedef struct Location {

View file

@ -2,8 +2,13 @@
#define INT128_H #define INT128_H
#include <assert.h> #include <assert.h>
#ifdef _MSC_VER
#include <win32/stdint.h>
#include <win32/stdbool.h>
#else
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#endif
typedef struct Int128 Int128; typedef struct Int128 Int128;

View file

@ -26,7 +26,11 @@
#ifndef QEMU_OPTIONS_H #ifndef QEMU_OPTIONS_H
#define QEMU_OPTIONS_H #define QEMU_OPTIONS_H
#ifdef _MSC_VER
#include <win32/stdint.h>
#else
#include <stdint.h> #include <stdint.h>
#endif
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"

View file

@ -1,291 +1,299 @@
/* /*
* OS includes and handling of OS dependencies * OS includes and handling of OS dependencies
* *
* This header exists to pull in some common system headers that * This header exists to pull in some common system headers that
* most code in QEMU will want, and to fix up some possible issues with * most code in QEMU will want, and to fix up some possible issues with
* it (missing defines, Windows weirdness, and so on). * it (missing defines, Windows weirdness, and so on).
* *
* To avoid getting into possible circular include dependencies, this * To avoid getting into possible circular include dependencies, this
* file should not include any other QEMU headers, with the exceptions * file should not include any other QEMU headers, with the exceptions
* of config-host.h, compiler.h, os-posix.h and os-win32.h, all of which * of config-host.h, compiler.h, os-posix.h and os-win32.h, all of which
* are doing a similar job to this file and are under similar constraints. * are doing a similar job to this file and are under similar constraints.
* *
* This header also contains prototypes for functions defined in * This header also contains prototypes for functions defined in
* os-*.c and util/oslib-*.c; those would probably be better split * os-*.c and util/oslib-*.c; those would probably be better split
* out into separate header files. * out into separate header files.
* *
* In an ideal world this header would contain only: * In an ideal world this header would contain only:
* (1) things which everybody needs * (1) things which everybody needs
* (2) things without which code would work on most platforms but * (2) things without which code would work on most platforms but
* fail to compile or misbehave on a minority of host OSes * fail to compile or misbehave on a minority of host OSes
* *
* This work is licensed under the terms of the GNU GPL, version 2 or later. * This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef QEMU_OSDEP_H #ifndef QEMU_OSDEP_H
#define QEMU_OSDEP_H #define QEMU_OSDEP_H
#include "config-host.h" #include "config-host.h"
#include "qemu/compiler.h" #include "qemu/compiler.h"
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include <stdbool.h> #ifdef _MSC_VER
#include <stdint.h> #include <win32/stdint.h>
#include <sys/types.h> #include <win32/stdbool.h>
#include <stdlib.h> #include <win32/inttypes.h>
#include <stdio.h> #else
#include <string.h> #include <stdint.h>
#ifndef _MSC_VER #include <stdbool.h>
#include <strings.h> #include <inttypes.h>
#endif #endif
#include <inttypes.h> #include <sys/types.h>
#include <limits.h> #include <stdlib.h>
/* Put unistd.h before time.h as that triggers localtime_r/gmtime_r #include <stdio.h>
* function availability on recentish Mingw-w64 platforms. */ #include <string.h>
#include <unistd.h> #ifndef _MSC_VER
#include <time.h> #include <strings.h>
#include <ctype.h> #endif
#include <errno.h> #include <limits.h>
#include <fcntl.h> /* Put unistd.h before time.h as that triggers localtime_r/gmtime_r
#include <sys/stat.h> * function availability on recentish Mingw-w64 platforms. */
#include <sys/time.h> #ifdef HAVE_UNISTD_H
#include <assert.h> # include <unistd.h>
#include <signal.h> #endif
#include <time.h>
#ifdef __OpenBSD__ #include <ctype.h>
#include <sys/signal.h> #include <errno.h>
#endif #include <fcntl.h>
#include <sys/stat.h>
#ifndef _WIN32 #include <sys/time.h>
#include <sys/wait.h> #include <assert.h>
#else #include <signal.h>
#define WIFEXITED(x) 1
#define WEXITSTATUS(x) (x) #ifdef __OpenBSD__
#endif #include <sys/signal.h>
#endif
#ifdef _WIN32
#include "sysemu/os-win32.h" #ifndef _WIN32
#endif #include <sys/wait.h>
#else
#ifdef CONFIG_POSIX #define WIFEXITED(x) 1
#include "sysemu/os-posix.h" #define WEXITSTATUS(x) (x)
#endif #endif
#if defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10 #ifdef _WIN32
/* [u]int_fast*_t not in <sys/int_types.h> */ #include "sysemu/os-win32.h"
typedef unsigned char uint_fast8_t; #endif
typedef unsigned int uint_fast16_t;
typedef signed int int_fast16_t; #ifdef CONFIG_POSIX
#endif #include "sysemu/os-posix.h"
#endif
#ifndef O_LARGEFILE
#define O_LARGEFILE 0 #if defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10
#endif /* [u]int_fast*_t not in <sys/int_types.h> */
#ifndef O_BINARY typedef unsigned char uint_fast8_t;
#define O_BINARY 0 typedef unsigned int uint_fast16_t;
#endif typedef signed int int_fast16_t;
#ifndef MAP_ANONYMOUS #endif
#define MAP_ANONYMOUS MAP_ANON
#endif #ifndef O_LARGEFILE
#ifndef ENOMEDIUM #define O_LARGEFILE 0
#define ENOMEDIUM ENODEV #endif
#endif #ifndef O_BINARY
#if !defined(ENOTSUP) #define O_BINARY 0
#define ENOTSUP 4096 #endif
#endif #ifndef MAP_ANONYMOUS
#if !defined(ECANCELED) #define MAP_ANONYMOUS MAP_ANON
#define ECANCELED 4097 #endif
#endif #ifndef ENOMEDIUM
#if !defined(EMEDIUMTYPE) #define ENOMEDIUM ENODEV
#define EMEDIUMTYPE 4098 #endif
#endif #if !defined(ENOTSUP)
#ifndef TIME_MAX #define ENOTSUP 4096
#define TIME_MAX LONG_MAX #endif
#endif #if !defined(ECANCELED)
#define ECANCELED 4097
#ifndef MIN #endif
#define MIN(a, b) (((a) < (b)) ? (a) : (b)) #if !defined(EMEDIUMTYPE)
#endif #define EMEDIUMTYPE 4098
#ifndef MAX #endif
#define MAX(a, b) (((a) > (b)) ? (a) : (b)) #ifndef TIME_MAX
#endif #define TIME_MAX LONG_MAX
#endif
/* Minimum function that returns zero only iff both values are zero.
* Intended for use with unsigned values only. */ #ifndef MIN
#ifndef MIN_NON_ZERO #define MIN(a, b) (((a) < (b)) ? (a) : (b))
#define MIN_NON_ZERO(a, b) (((a) != 0 && (a) < (b)) ? (a) : (b)) #endif
#endif #ifndef MAX
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
#ifndef ROUND_UP #endif
#define ROUND_UP(n,d) (((n) + (d) - 1) & -(d))
#endif /* Minimum function that returns zero only iff both values are zero.
* Intended for use with unsigned values only. */
#ifndef DIV_ROUND_UP #ifndef MIN_NON_ZERO
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) #define MIN_NON_ZERO(a, b) (((a) != 0 && (a) < (b)) ? (a) : (b))
#endif #endif
#ifndef ARRAY_SIZE #ifndef ROUND_UP
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define ROUND_UP(n,d) (((n) + (d) - 1) & -(d))
#endif #endif
int qemu_daemon(int nochdir, int noclose); #ifndef DIV_ROUND_UP
void *qemu_try_memalign(size_t alignment, size_t size); #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
void *qemu_memalign(size_t alignment, size_t size); #endif
void *qemu_anon_ram_alloc(size_t size, uint64_t *align);
void qemu_vfree(void *ptr); #ifndef ARRAY_SIZE
void qemu_anon_ram_free(void *ptr, size_t size); #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#endif
#define QEMU_MADV_INVALID -1
int qemu_daemon(int nochdir, int noclose);
#if defined(CONFIG_MADVISE) void *qemu_try_memalign(size_t alignment, size_t size);
void *qemu_memalign(size_t alignment, size_t size);
#define QEMU_MADV_WILLNEED MADV_WILLNEED void *qemu_anon_ram_alloc(size_t size, uint64_t *align);
#define QEMU_MADV_DONTNEED MADV_DONTNEED void qemu_vfree(void *ptr);
#ifdef MADV_DONTFORK void qemu_anon_ram_free(void *ptr, size_t size);
#define QEMU_MADV_DONTFORK MADV_DONTFORK
#else #define QEMU_MADV_INVALID -1
#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID
#endif #if defined(CONFIG_MADVISE)
#ifdef MADV_MERGEABLE
#define QEMU_MADV_MERGEABLE MADV_MERGEABLE #define QEMU_MADV_WILLNEED MADV_WILLNEED
#else #define QEMU_MADV_DONTNEED MADV_DONTNEED
#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID #ifdef MADV_DONTFORK
#endif #define QEMU_MADV_DONTFORK MADV_DONTFORK
#ifdef MADV_UNMERGEABLE #else
#define QEMU_MADV_UNMERGEABLE MADV_UNMERGEABLE #define QEMU_MADV_DONTFORK QEMU_MADV_INVALID
#else #endif
#define QEMU_MADV_UNMERGEABLE QEMU_MADV_INVALID #ifdef MADV_MERGEABLE
#endif #define QEMU_MADV_MERGEABLE MADV_MERGEABLE
#ifdef MADV_DODUMP #else
#define QEMU_MADV_DODUMP MADV_DODUMP #define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
#else #endif
#define QEMU_MADV_DODUMP QEMU_MADV_INVALID #ifdef MADV_UNMERGEABLE
#endif #define QEMU_MADV_UNMERGEABLE MADV_UNMERGEABLE
#ifdef MADV_DONTDUMP #else
#define QEMU_MADV_DONTDUMP MADV_DONTDUMP #define QEMU_MADV_UNMERGEABLE QEMU_MADV_INVALID
#else #endif
#define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID #ifdef MADV_DODUMP
#endif #define QEMU_MADV_DODUMP MADV_DODUMP
#ifdef MADV_HUGEPAGE #else
#define QEMU_MADV_HUGEPAGE MADV_HUGEPAGE #define QEMU_MADV_DODUMP QEMU_MADV_INVALID
#else #endif
#define QEMU_MADV_HUGEPAGE QEMU_MADV_INVALID #ifdef MADV_DONTDUMP
#endif #define QEMU_MADV_DONTDUMP MADV_DONTDUMP
#else
#elif defined(CONFIG_POSIX_MADVISE) #define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
#endif
#define QEMU_MADV_WILLNEED POSIX_MADV_WILLNEED #ifdef MADV_HUGEPAGE
#define QEMU_MADV_DONTNEED POSIX_MADV_DONTNEED #define QEMU_MADV_HUGEPAGE MADV_HUGEPAGE
#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID #else
#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID #define QEMU_MADV_HUGEPAGE QEMU_MADV_INVALID
#define QEMU_MADV_UNMERGEABLE QEMU_MADV_INVALID #endif
#define QEMU_MADV_DODUMP QEMU_MADV_INVALID
#define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID #elif defined(CONFIG_POSIX_MADVISE)
#define QEMU_MADV_HUGEPAGE QEMU_MADV_INVALID
#define QEMU_MADV_WILLNEED POSIX_MADV_WILLNEED
#else /* no-op */ #define QEMU_MADV_DONTNEED POSIX_MADV_DONTNEED
#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID
#define QEMU_MADV_WILLNEED QEMU_MADV_INVALID #define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
#define QEMU_MADV_DONTNEED QEMU_MADV_INVALID #define QEMU_MADV_UNMERGEABLE QEMU_MADV_INVALID
#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID #define QEMU_MADV_DODUMP QEMU_MADV_INVALID
#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID #define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
#define QEMU_MADV_UNMERGEABLE QEMU_MADV_INVALID #define QEMU_MADV_HUGEPAGE QEMU_MADV_INVALID
#define QEMU_MADV_DODUMP QEMU_MADV_INVALID
#define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID #else /* no-op */
#define QEMU_MADV_HUGEPAGE QEMU_MADV_INVALID
#define QEMU_MADV_WILLNEED QEMU_MADV_INVALID
#endif #define QEMU_MADV_DONTNEED QEMU_MADV_INVALID
#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID
int qemu_madvise(void *addr, size_t len, int advice); #define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
#define QEMU_MADV_UNMERGEABLE QEMU_MADV_INVALID
int qemu_open(const char *name, int flags, ...); #define QEMU_MADV_DODUMP QEMU_MADV_INVALID
int qemu_close(int fd); #define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
#define QEMU_MADV_HUGEPAGE QEMU_MADV_INVALID
#if defined(__HAIKU__) && defined(__i386__)
#define FMT_pid "%ld" #endif
#elif defined(WIN64)
#define FMT_pid "%" PRId64 int qemu_madvise(void *addr, size_t len, int advice);
#else
#define FMT_pid "%d" int qemu_open(const char *name, int flags, ...);
#endif int qemu_close(int fd);
int qemu_create_pidfile(const char *filename); #if defined(__HAIKU__) && defined(__i386__)
int qemu_get_thread_id(void); #define FMT_pid "%ld"
#elif defined(WIN64)
#ifndef CONFIG_IOVEC #define FMT_pid "%" PRId64
struct iovec { #else
void *iov_base; #define FMT_pid "%d"
int iov_len; #endif
};
/* int qemu_create_pidfile(const char *filename);
* Use the same value as Linux for now. int qemu_get_thread_id(void);
*/
#define IOV_MAX 1024 #ifndef CONFIG_IOVEC
struct iovec {
ssize_t readv(int fd, const struct iovec *iov, int iov_cnt); void *iov_base;
ssize_t writev(int fd, const struct iovec *iov, int iov_cnt); int iov_len;
#else };
#include <sys/uio.h> /*
#endif * Use the same value as Linux for now.
*/
#ifdef _WIN32 #define IOV_MAX 1024
static inline void qemu_timersub(const struct timeval *val1,
const struct timeval *val2, ssize_t readv(int fd, const struct iovec *iov, int iov_cnt);
struct timeval *res) ssize_t writev(int fd, const struct iovec *iov, int iov_cnt);
{ #else
res->tv_sec = val1->tv_sec - val2->tv_sec; #include <sys/uio.h>
if (val1->tv_usec < val2->tv_usec) { #endif
res->tv_sec--;
res->tv_usec = val1->tv_usec - val2->tv_usec + 1000 * 1000; #ifdef _WIN32
} else { static inline void qemu_timersub(const struct timeval *val1,
res->tv_usec = val1->tv_usec - val2->tv_usec; const struct timeval *val2,
} struct timeval *res)
} {
#else res->tv_sec = val1->tv_sec - val2->tv_sec;
#define qemu_timersub timersub if (val1->tv_usec < val2->tv_usec) {
#endif res->tv_sec--;
res->tv_usec = val1->tv_usec - val2->tv_usec + 1000 * 1000;
void qemu_set_cloexec(int fd); } else {
res->tv_usec = val1->tv_usec - val2->tv_usec;
void qemu_set_version(const char *); }
const char *qemu_get_version(void); }
#else
void fips_set_state(bool requested); #define qemu_timersub timersub
bool fips_get_state(void); #endif
/* Return a dynamically allocated pathname denoting a file or directory that is void qemu_set_cloexec(int fd);
* appropriate for storing local state.
* void qemu_set_version(const char *);
* @relative_pathname need not start with a directory separator; one will be const char *qemu_get_version(void);
* added automatically.
* void fips_set_state(bool requested);
* The caller is responsible for releasing the value returned with g_free() bool fips_get_state(void);
* after use.
*/ /* Return a dynamically allocated pathname denoting a file or directory that is
char *qemu_get_local_state_pathname(const char *relative_pathname); * appropriate for storing local state.
*
/* Find program directory, and save it for later usage with * @relative_pathname need not start with a directory separator; one will be
* qemu_get_exec_dir(). * added automatically.
* Try OS specific API first, if not working, parse from argv0. */ *
void qemu_init_exec_dir(const char *argv0); * The caller is responsible for releasing the value returned with g_free()
* after use.
/* Get the saved exec dir. */
* Caller needs to release the returned string by g_free() */ char *qemu_get_local_state_pathname(const char *relative_pathname);
char *qemu_get_exec_dir(void);
/* Find program directory, and save it for later usage with
/** * qemu_get_exec_dir().
* qemu_getauxval: * Try OS specific API first, if not working, parse from argv0. */
* @type: the auxiliary vector key to lookup void qemu_init_exec_dir(const char *argv0);
*
* Search the auxiliary vector for @type, returning the value /* Get the saved exec dir.
* or 0 if @type is not present. * Caller needs to release the returned string by g_free() */
*/ char *qemu_get_exec_dir(void);
unsigned long qemu_getauxval(unsigned long type);
/**
void qemu_set_tty_echo(int fd, bool echo); * qemu_getauxval:
* @type: the auxiliary vector key to lookup
void os_mem_prealloc(int fd, char *area, size_t sz); *
* Search the auxiliary vector for @type, returning the value
int qemu_read_password(char *buf, int buf_size); * or 0 if @type is not present.
*/
#endif unsigned long qemu_getauxval(unsigned long type);
void qemu_set_tty_echo(int fd, bool echo);
void os_mem_prealloc(int fd, char *area, size_t sz);
int qemu_read_password(char *buf, int buf_size);
#endif

View file

@ -16,8 +16,13 @@
#ifndef QAPI_TYPES_H #ifndef QAPI_TYPES_H
#define QAPI_TYPES_H #define QAPI_TYPES_H
#include <stdbool.h> #ifdef _MSC_VER
#include <win32/stdint.h>
#include <win32/stdbool.h>
#else
#include <stdint.h> #include <stdint.h>
#include <stdbool.h>
#endif
#include "qapi/qmp/qobject.h" #include "qapi/qmp/qobject.h"
#ifndef QAPI_TYPES_BUILTIN #ifndef QAPI_TYPES_BUILTIN

View file

@ -79,7 +79,6 @@
#include "qemu/compiler.h" #include "qemu/compiler.h"
#include "qapi-types.h" #include "qapi-types.h"
#include <stdbool.h>
/* /*
* Opaque error object. * Opaque error object.

View file

@ -16,8 +16,7 @@
#include "qapi/qmp/qobject.h" #include "qapi/qmp/qobject.h"
#include "qapi/qmp/qlist.h" #include "qapi/qmp/qlist.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#include <stdbool.h> //#include <stdint.h>
#include <stdint.h>
#define QDICT_BUCKET_MAX 512 #define QDICT_BUCKET_MAX 512

View file

@ -13,7 +13,6 @@
#ifndef QSTRING_H #ifndef QSTRING_H
#define QSTRING_H #define QSTRING_H
#include <stdint.h>
#include "qapi/qmp/qobject.h" #include "qapi/qmp/qobject.h"
typedef struct QString { typedef struct QString {

View file

@ -1,9 +1,6 @@
#ifndef __QEMU_THREAD_H #ifndef __QEMU_THREAD_H
#define __QEMU_THREAD_H 1 #define __QEMU_THREAD_H 1
#include <inttypes.h>
#include <stdbool.h>
typedef struct QemuMutex QemuMutex; typedef struct QemuMutex QemuMutex;
typedef struct QemuCond QemuCond; typedef struct QemuCond QemuCond;
typedef struct QemuSemaphore QemuSemaphore; typedef struct QemuSemaphore QemuSemaphore;

View file

@ -1,7 +1,7 @@
#ifndef INTTYPES_H #ifndef INTTYPES_H
#define INTTYPES_H #define INTTYPES_H
#include <stdint.h> #include <win32/stdint.h>
#ifdef _WIN64 #ifdef _WIN64
typedef __int64 ssize_t; typedef __int64 ssize_t;

View file

@ -1,6 +0,0 @@
#ifndef UNISTD_H
#define UNISTD_H
#include <stdlib.h>
#endif

View file

@ -5,7 +5,6 @@
#include "slirp_config.h" #include "slirp_config.h"
#ifdef _WIN32 #ifdef _WIN32
# include <inttypes.h>
typedef char *caddr_t; typedef char *caddr_t;

View file

@ -52,7 +52,9 @@
#undef DUMMY_PPP #undef DUMMY_PPP
/* Define if you have unistd.h */ /* Define if you have unistd.h */
#ifndef _WIN32
#define HAVE_UNISTD_H #define HAVE_UNISTD_H
#endif
/* Define if you have stdlib.h */ /* Define if you have stdlib.h */
#define HAVE_STDLIB_H #define HAVE_STDLIB_H