Index: reactos/CMakeLists.txt =================================================================== --- reactos/CMakeLists.txt (revision 73227) +++ reactos/CMakeLists.txt (working copy) @@ -73,6 +73,7 @@ include(sdk/cmake/compilerflags.cmake) add_definitions(-D__REACTOS__) +add_definitions(-D_GLIBCXX_HAVE_BROKEN_VSWPRINTF) if(MSVC_IDE) add_compile_flags("/MP") Index: reactos/dll/opengl/glu32/CMakeLists.txt =================================================================== --- reactos/dll/opengl/glu32/CMakeLists.txt (revision 73227) +++ reactos/dll/opengl/glu32/CMakeLists.txt (working copy) @@ -113,7 +113,7 @@ set_module_type(glu32 win32dll) if(NOT MSVC) - add_target_compile_flags(glu32 "-Wno-write-strings -Wno-unused-but-set-variable") + add_target_compile_flags(glu32 "-Wno-write-strings -Wno-unused-but-set-variable -Wno-nonnull-compare") endif() add_importlibs(glu32 opengl32 gdi32 msvcrt kernel32 ntdll) Index: reactos/drivers/filesystems/ext2/inc/linux/errno.h =================================================================== --- reactos/drivers/filesystems/ext2/inc/linux/errno.h (revision 73227) +++ reactos/drivers/filesystems/ext2/inc/linux/errno.h (working copy) @@ -116,7 +116,9 @@ #define ENOTCONN 107 /* Transport endpoint is not connected */ #define ESHUTDOWN 108 /* Cannot send after transport endpoint shutdown */ #define ETOOMANYREFS 109 /* Too many references: cannot splice */ +#ifndef __REACTOS__ #define ETIMEDOUT 110 /* Connection timed out */ +#endif #define ECONNREFUSED 111 /* Connection refused */ #define EHOSTDOWN 112 /* Host is down */ #define EHOSTUNREACH 113 /* No route to host */ Index: reactos/drivers/filesystems/reiserfs/inc/linux/errno.h =================================================================== --- reactos/drivers/filesystems/reiserfs/inc/linux/errno.h (revision 73227) +++ reactos/drivers/filesystems/reiserfs/inc/linux/errno.h (working copy) @@ -84,7 +84,9 @@ #define EMULTIHOP 72 /* Multihop attempted */ #define EDOTDOT 73 /* RFS specific error */ #define EBADMSG 74 /* Not a data message */ +#ifndef __REACTOS__ #define EOVERFLOW 75 /* Value too large for defined data type */ +#endif #define ENOTUNIQ 76 /* Name not unique on network */ #define EBADFD 77 /* File descriptor in bad state */ #define EREMCHG 78 /* Remote address changed */ @@ -120,7 +122,9 @@ #define ENOTCONN 107 /* Transport endpoint is not connected */ #define ESHUTDOWN 108 /* Cannot send after transport endpoint shutdown */ #define ETOOMANYREFS 109 /* Too many references: cannot splice */ +#ifndef __REACTOS__ #define ETIMEDOUT 110 /* Connection timed out */ +#endif #define ECONNREFUSED 111 /* Connection refused */ #define EHOSTDOWN 112 /* Host is down */ #define EHOSTUNREACH 113 /* No route to host */ Index: reactos/sdk/cmake/gcc.cmake =================================================================== --- reactos/sdk/cmake/gcc.cmake (revision 73227) +++ reactos/sdk/cmake/gcc.cmake (working copy) @@ -117,6 +117,9 @@ add_compile_flags("-Wall -Wpointer-arith") add_compile_flags("-Wno-char-subscripts -Wno-multichar -Wno-unused-value") +add_compile_flags("-Wno-misleading-indentation") +add_compile_flags("-Wno-unused-const-variable") +add_compile_flags("-Wno-unused-local-typedefs") if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_flags("-Wno-maybe-uninitialized") @@ -253,7 +256,7 @@ if((NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (NOT CMAKE_BUILD_TYPE STREQUAL "Release")) # FIXME: Set this once Clang toolchain works with it - set(_compress_debug_sections_flag "-Wa,--compress-debug-sections") + #set(_compress_debug_sections_flag "-Wa,--compress-debug-sections") endif() if(CMAKE_VERSION VERSION_LESS 3.4.0) Index: reactos/sdk/include/crt/_mingw.h =================================================================== --- reactos/sdk/include/crt/_mingw.h (revision 73227) +++ reactos/sdk/include/crt/_mingw.h (working copy) @@ -130,6 +130,22 @@ #define __MINGW_ATTRIB_DEPRECATED #endif +#if __MINGW_GNUC_PREREQ (3, 1) +#define __MINGW_ATTRIB_DEPRECATED_SEC_WARN //__attribute__ ((__deprecated__)) +#elif __MINGW_MSC_PREREQ(12, 0) +#define __MINGW_ATTRIB_DEPRECATED_SEC_WARN //__declspec(deprecated) +#else +#define __MINGW_ATTRIB_DEPRECATED_SEC_WARN +#endif + +#if __MINGW_GNUC_PREREQ (3, 1) +#define __MINGW_ATTRIB_DEPRECATED_MSVC2005 //__attribute__ ((__deprecated__)) +#elif __MINGW_MSC_PREREQ(12, 0) +#define __MINGW_ATTRIB_DEPRECATED_MSVC2005 //__declspec(deprecated) +#else +#define __MINGW_ATTRIB_DEPRECATED_MSVC2005 +#endif + #if __MINGW_GNUC_PREREQ (3, 3) #define __MINGW_NOTHROW __attribute__ ((__nothrow__)) #elif __MINGW_MSC_PREREQ(12, 0) && defined (__cplusplus) @@ -225,6 +241,15 @@ #endif #endif /* DECLSPEC_HOTPATCH */ +#ifdef __cplusplus +# define __mingw_ovr inline __cdecl +#elif defined (__GNUC__) +# define __mingw_ovr static \ + __attribute__ ((__unused__)) __inline__ __cdecl +#else +# define __mingw_ovr static __cdecl +#endif /* __cplusplus */ + #include "_mingw_mac.h" #endif /* !_INC_MINGW */ Index: reactos/sdk/include/crt/errno.h =================================================================== --- reactos/sdk/include/crt/errno.h (revision 73227) +++ reactos/sdk/include/crt/errno.h (working copy) @@ -67,6 +67,18 @@ #endif #endif +#ifndef ENOTSUP +#define ENOTSUP 129 +#endif + +#ifndef EOVERFLOW +#define EOVERFLOW 132 +#endif + +#ifndef ETIMEDOUT +#define ETIMEDOUT 138 +#endif + #define EDEADLOCK EDEADLK #define EWOULDBLOCK 140 Index: reactos/sdk/include/psdk/cguid.h =================================================================== --- reactos/sdk/include/psdk/cguid.h (revision 73227) +++ reactos/sdk/include/psdk/cguid.h (working copy) @@ -95,11 +95,11 @@ extern const CLSID CLSID_CGridPropertyPage; extern const CLSID CLSID_CWSJArticlePage; extern const CLSID CLSID_CSystemPage; -extern const CLSID CLSID_IdentityUnmarshal; +extern const CLSID DECLSPEC_SELECTANY CLSID_IdentityUnmarshal; extern const CLSID CLSID_InProcFreeMarshaler; -extern const CLSID CLSID_Picture_Metafile; -extern const CLSID CLSID_Picture_EnhMetafile; -extern const CLSID CLSID_Picture_Dib; +extern const CLSID DECLSPEC_SELECTANY CLSID_Picture_Metafile; +extern const CLSID DECLSPEC_SELECTANY CLSID_Picture_EnhMetafile; +extern const CLSID DECLSPEC_SELECTANY CLSID_Picture_Dib; extern const GUID GUID_TRISTATE; Index: reactos/sdk/include/psdk/docobj.idl =================================================================== --- reactos/sdk/include/psdk/docobj.idl (revision 73227) +++ reactos/sdk/include/psdk/docobj.idl (working copy) @@ -419,4 +419,4 @@ cpp_quote("#define IID_IEnumMsoView IID_IEnumOleDocumentViews") cpp_quote("#define IID_IMsoCommandTarget IID_IOleCommandTarget") -cpp_quote("EXTERN_C const GUID SID_SContainerDispatch;") +cpp_quote("EXTERN_C const GUID DECLSPEC_SELECTANY SID_SContainerDispatch;") Index: reactos/sdk/include/psdk/guiddef.h =================================================================== --- reactos/sdk/include/psdk/guiddef.h (revision 73227) +++ reactos/sdk/include/psdk/guiddef.h (working copy) @@ -61,9 +61,14 @@ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #endif #else +#if defined(__GNUC__) && __GNUC__ >= 6 #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const GUID DECLSPEC_SELECTANY name +#else +#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ EXTERN_C const GUID name #endif +#endif #define DEFINE_OLEGUID(name, l, w1, w2) \ DEFINE_GUID(name, l, w1, w2, 0xC0,0,0,0,0,0,0,0x46) Index: reactos/sdk/include/psdk/ks.h =================================================================== --- reactos/sdk/include/psdk/ks.h (revision 73227) +++ reactos/sdk/include/psdk/ks.h (working copy) @@ -5062,6 +5062,7 @@ _In_ const KSPIN_DESCRIPTOR_EX *const PinDescriptor, _Out_ PULONG PinID); +#if 0 _IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI __inline @@ -5068,6 +5069,7 @@ PKSDEVICE KsFilterFactoryGetDevice( _In_ PKSFILTERFACTORY FilterFactory); +#endif /* etc. */ #endif /* avstream */ Index: reactos/sdk/include/psdk/mswsockdef.h =================================================================== --- reactos/sdk/include/psdk/mswsockdef.h (revision 73227) +++ reactos/sdk/include/psdk/mswsockdef.h (working copy) @@ -20,7 +20,7 @@ #if(_WIN32_WINNT >= 0x0600) #ifdef _WS2DEF_ - +#if 0 extern CONST UCHAR sockaddr_size[AF_MAX]; MSWSOCKDEF_INLINE @@ -31,7 +31,7 @@ return (UCHAR)((af < AF_MAX) ? sockaddr_size[af] : sockaddr_size[AF_UNSPEC]); } - +#endif MSWSOCKDEF_INLINE SCOPE_LEVEL ScopeLevel( Index: reactos/sdk/include/psdk/msxml2.idl =================================================================== --- reactos/sdk/include/psdk/msxml2.idl (revision 73227) +++ reactos/sdk/include/psdk/msxml2.idl (working copy) @@ -1258,7 +1258,7 @@ [id(DISPID_XMLDOM_PROCESSOR_SETSTARTMODE)] HRESULT setStartMode( [in] BSTR p, - [in, defaultvalue(L"")] BSTR uri); + [in] BSTR uri); [propget, id(DISPID_XMLDOM_PROCESSOR_STARTMODE)] HRESULT startMode([retval, out] BSTR *p); @@ -1286,7 +1286,7 @@ HRESULT addParameter( [in] BSTR p, [in] VARIANT var, - [in, defaultvalue(L"")] BSTR uri); + [in] BSTR uri); [id(DISPID_XMLDOM_PROCESSOR_ADDOBJECT)] HRESULT addObject( Index: reactos/sdk/include/psdk/olectlid.h =================================================================== --- reactos/sdk/include/psdk/olectlid.h (revision 73227) +++ reactos/sdk/include/psdk/olectlid.h (working copy) @@ -101,8 +101,8 @@ extern const GUID IID_IViewObject2; extern const GUID IID_IOleCache2; extern const GUID IID_IOleCacheControl; -extern const GUID CLSID_Picture_Metafile; -extern const GUID CLSID_Picture_Dib; +extern const GUID DECLSPEC_SELECTANY CLSID_Picture_Metafile; +extern const GUID DECLSPEC_SELECTANY CLSID_Picture_Dib; #ifdef __cplusplus } Index: rostests/rosautotest/CWineTest.cpp =================================================================== --- rostests/rosautotest/CWineTest.cpp (revision 73227) +++ rostests/rosautotest/CWineTest.cpp (working copy) @@ -217,7 +217,7 @@ continue; { - auto_ptr TestInfo(new CTestInfo()); + unique_ptr TestInfo(new CTestInfo()); size_t UnderscorePosition; /* Build the command line */ @@ -329,8 +329,8 @@ void CWineTest::Run() { - auto_ptr TestList; - auto_ptr WebService; + unique_ptr TestList; + unique_ptr WebService; CTestInfo* TestInfo; DWORD ErrorMode; @@ -362,7 +362,7 @@ /* Get information for each test to run */ while((TestInfo = TestList->GetNextTestInfo()) != 0) { - auto_ptr TestInfoPtr(TestInfo); + unique_ptr TestInfoPtr(TestInfo); RunTest(TestInfo);