VirtualBox

Changeset 66823 in vbox for trunk/include


Ignore:
Timestamp:
May 8, 2017 4:51:09 PM (8 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
115270
Message:

include/iprt: Adjustments for Visual C++ v12 / Visual Studio 2013. Most to do with using SDK 7.1 and sal_supp.h there clashing slightly with a related compiler include.

Location:
trunk/include
Files:
1 added
20 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/include/Makefile.kmk

    r64373 r66823  
    5353        VBox/vscsi.h \
    5454        $(wildcard VBox/ExtPack/*.h ) \
     55        $(wildcard iprt/win/*.h ) \
    5556        iprt/alloca.h \
    5657        iprt/tcp.h \

  • trunk/include/iprt/bldprog-strtab-template.cpp.h

    r64814 r66823  
    892892# ifdef BLDPROG_STRTAB_PURE_ASCII
    893893            abort();
    894             fprintf(pOut, "\\x%02x", (unsigned)uch);
    895894# else
    896895            RTUNICP uc = RTStrGetCp((const char *)psz);

  • trunk/include/iprt/nt/miniport.h

    r63036 r66823  
    3333# pragma warning(push)
    3434# pragma warning(disable:4668) /* basetsd.h(114) : warning C4668: '__midl' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
     35# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     36#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     37# endif
    3538#endif
    3639

  • trunk/include/iprt/nt/ndis.h

    r63036 r66823  
    3333# pragma warning(push)
    3434# pragma warning(disable:4668) /* warning C4668: 'NDIS_WRAPPER' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
     35# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     36#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     37# endif
    3538#endif
    3639

  • trunk/include/iprt/nt/nt.h

    r65238 r66823  
    197197# pragma warning(disable: 4668)
    198198# pragma warning(disable: 4255) /* warning C4255: 'ObGetFilterVersion' : no function prototype given: converting '()' to '(void)' */
     199# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     200#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     201#  pragma warning(disable:4471) /* wdm.h(11057) : warning C4471: '_POOL_TYPE' : a forward declaration of an unscoped enumeration must have an underlying type (int assumed) */
     202# endif
    199203
    200204# include <ntifs.h>

  • trunk/include/iprt/nt/ntddk.h

    r63039 r66823  
    4848#pragma warning(disable:4668) /* warning C4668: 'WHEA_DOWNLEVEL_TYPE_NAMES' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
    4949#pragma warning(disable:4255) /* warning C4255: 'ObGetFilterVersion' : no function prototype given: converting '()' to '(void)' */
     50#if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     51# pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     52# pragma warning(disable:4471) /* wdm.h(11057) : warning C4471: '_POOL_TYPE' : a forward declaration of an unscoped enumeration must have an underlying type (int assumed) */
     53#endif
    5054/*RT_C_DECLS_BEGIN - no longer necessary it seems */
    5155#include <ntddk.h>

  • trunk/include/iprt/nt/wdm.h

    r63126 r66823  
    4949#pragma warning(disable:4255) /* warning C4255: 'ObGetFilterVersion' : no function prototype given: converting '()' to '(void)' */
    5050#pragma warning(disable:4005) /* wdm.h(29) : warning C4005: 'NO_INTERLOCKED_INTRINSICS' : macro redefinition */
     51#if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     52# pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     53# pragma warning(disable:4471) /* wdm.h(11057) : warning C4471: '_POOL_TYPE' : a forward declaration of an unscoped enumeration must have an underlying type (int assumed) */
     54#endif
    5155#include <wdm.h>
    5256#pragma warning(pop)

  • trunk/include/iprt/stdarg.h

    r62940 r66823  
    4747
    4848/*
    49  * MSC doesn't implement va_copy.
     49 * Older MSC versions doesn't implement va_copy.  Newer (12.0+?) ones does
     50 * implement it like below, but for now it's easier to continue like for the
     51 * older ones so we can more easily handle R0, RC and other weird contexts.
    5052 */
    51 #ifndef va_copy
     53#if !defined(va_copy) || defined(_MSC_VER)
     54# undef  va_copy
    5255# define va_copy(dst, src) do { (dst) = (src); } while (0) /** @todo check AMD64 */
    5356#endif

  • trunk/include/iprt/win/d3d8.h

    r63022 r66823  
    3333# pragma warning(disable:4668) /* warning C4668: 'WHEA_DOWNLEVEL_TYPE_NAMES' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
    3434# pragma warning(disable:4255) /* warning C4255: 'ObGetFilterVersion' : no function prototype given: converting '()' to '(void)' */
     35# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     36#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     37# endif
    3538#endif
    3639

  • trunk/include/iprt/win/d3d9.h

    r63022 r66823  
    3333# pragma warning(disable:4668) /* warning C4668: 'WHEA_DOWNLEVEL_TYPE_NAMES' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
    3434# pragma warning(disable:4255) /* warning C4255: 'ObGetFilterVersion' : no function prototype given: converting '()' to '(void)' */
     35# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     36#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     37# endif
    3538#endif
    3639

  • trunk/include/iprt/win/intsafe.h

    r63069 r66823  
    4949#  pragma warning(push)
    5050#  pragma warning(disable:4668) /* intsafe.h(55) : warning C4668: '__midl' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
     51#  if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     52#   pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     53#  endif
    5154# endif
    5255

  • trunk/include/iprt/win/lazy-dbghelp.h

    r62474 r66823  
    3030#include <iprt/path.h>
    3131#include <iprt/env.h>
     32#include <iprt/err.h>
    3233
    3334

  • trunk/include/iprt/win/objbase.h

    r63216 r66823  
    3434#  pragma warning(disable:4255) /* 'FARPROC' : no function prototype given: converting '()' to '(void)' */
    3535# endif
     36# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     37#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     38# endif
    3639#endif
    3740

  • trunk/include/iprt/win/objidl.h

    r63549 r66823  
    3030#pragma warning(push)
    3131#pragma warning(disable:4668) /* '__midl' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
     32#if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     33# pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     34# pragma warning(disable:4255) /* windef.h(227) : warning C4255: 'NEARPROC' : no function prototype given: converting '()' to '(void)' */
     35#endif
    3236
    3337#include <objidl.h>

  • trunk/include/iprt/win/shlobj.h

    r63310 r66823  
    3232# pragma warning(disable:4668) /* warning C4668: 'USE_SP_ALTPLATFORM_INFO_V1' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
    3333#endif
     34#if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     35# pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     36# pragma warning(disable:4255) /* windef.h(227) : warning C4255: 'NEARPROC' : no function prototype given: converting '()' to '(void)' */
     37#endif
    3438
    3539#include <shlobj.h>

  • trunk/include/iprt/win/shlwapi.h

    r63549 r66823  
    3131#pragma warning(disable:4668) /* warning C4668: 'USE_SP_ALTPLATFORM_INFO_V1' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
    3232#pragma warning(disable:4255) /* warning C4255: 'I_RpcMgmtEnableDedicatedThreadPool' : no function prototype given: converting '()' to '(void)' */
     33#if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     34# pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     35#endif
    3336#include <shlwapi.h>
    3437

  • trunk/include/iprt/win/windef.h

    r63057 r66823  
    3939#  pragma warning(disable:4255) /* warning C4255: 'FARPROC' : no function prototype given: converting '()' to '(void)' */
    4040# endif
     41# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     42#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     43# endif
    4144#endif
    4245

  • trunk/include/iprt/win/windows.h

    r63022 r66823  
    3535# pragma warning(push)
    3636# pragma warning(disable:4668)
     37# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     38#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     39# endif
    3740# ifndef __cplusplus
    3841#  pragma warning(disable:4255) /* warning C4255: 'FARPROC' : no function prototype given: converting '()' to '(void)' */

  • trunk/include/iprt/win/winsock.h

    r66811 r66823  
    3838#  pragma warning(disable:4255) /* warning C4255: 'FARPROC' : no function prototype given: converting '()' to '(void)' */
    3939# endif
     40# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     41#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     42# endif
    4043#endif
    4144
    42 #include <winsock2.h>
     45#include <winsock.h>
    4346
    4447#ifdef _MSC_VER

  • trunk/include/iprt/win/winsock2.h

    r63022 r66823  
    3838#  pragma warning(disable:4255) /* warning C4255: 'FARPROC' : no function prototype given: converting '()' to '(void)' */
    3939# endif
     40# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     41#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     42# endif
    4043#endif
    4144

  • trunk/include/iprt/win/ws2tcpip.h

    r63549 r66823  
    3030#pragma warning(push)
    3131#pragma warning(disable:4668) /* 'NDIS_SUPPORT_NDIS6' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
     32#if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     33# pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     34# pragma warning(disable:4255) /* windef.h(227) : warning C4255: 'NEARPROC' : no function prototype given: converting '()' to '(void)' */
     35#endif
    3236
    3337#include <ws2tcpip.h>
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette