VirtualBox

Changeset 66823 in vbox for trunk/include/iprt/win


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/iprt/win
Files:
1 added
12 edited
1 copied

Legend:

Unmodified
Added
Removed

  • 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.

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