Changeset 60852 in webkit


Ignore:
Timestamp:
Jun 8, 2010 10:37:44 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-06-08 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r60830.
​http://trac.webkit.org/changeset/60830
​https://bugs.webkit.org/show_bug.cgi?id=40305

Broke the Windows build (Requested by abarth on #webkit).

  • JavaScriptCore.vcproj/WTF/WTF.vcproj:
  • wtf/OwnPtrCommon.h:
  • wtf/brew/OwnPtrBrew.h: Removed.
  • wtf/win/OwnPtrWin.h: Removed.
Location:
trunk/JavaScriptCore
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r60832 r60852  
     12010-06-08  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r60830.
     4        http://trac.webkit.org/changeset/60830
     5        https://bugs.webkit.org/show_bug.cgi?id=40305
     6
     7        Broke the Windows build (Requested by abarth on #webkit).
     8
     9        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
     10        * wtf/OwnPtrCommon.h:
     11        * wtf/brew/OwnPtrBrew.h: Removed.
     12        * wtf/win/OwnPtrWin.h: Removed.
     13
    1142010-06-08  MORITA Hajime  <morrita@google.com>
    215

  • trunk/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj

    r60830 r60852  
    244244                                >
    245245                        </File>
    246                         <File
    247                                 RelativePath="..\..\wtf\win\OwnPtrWin.h"
    248                                 >
    249                         </File>
    250246                </Filter>
    251247                <File

  • trunk/JavaScriptCore/wtf/OwnPtrCommon.h

    r60830 r60852  
    2929#define WTF_OwnPtrCommon_h
    3030
     31#if PLATFORM(WIN)
     32typedef struct HBITMAP__* HBITMAP;
     33typedef struct HBRUSH__* HBRUSH;
     34typedef struct HDC__* HDC;
     35typedef struct HFONT__* HFONT;
     36typedef struct HPALETTE__* HPALETTE;
     37typedef struct HPEN__* HPEN;
     38typedef struct HRGN__* HRGN;
     39#endif
     40
     41#if PLATFORM(BREWMP)
     42// Forward delcarations at this point avoid the need to include BREW includes
     43// in WTF headers.
     44typedef struct _ISocket ISocket;
     45typedef struct _IFileMgr IFileMgr;
     46typedef struct _IFile IFile;
     47typedef struct IBitmap IBitmap;
     48typedef struct ISSL ISSL;
     49#endif
     50
    3151namespace WTF {
    3252
    … …  
    3858    }
    3959
     60#if PLATFORM(WIN)
     61    void deleteOwnedPtr(HBITMAP);
     62    void deleteOwnedPtr(HBRUSH);
     63    void deleteOwnedPtr(HDC);
     64    void deleteOwnedPtr(HFONT);
     65    void deleteOwnedPtr(HPALETTE);
     66    void deleteOwnedPtr(HPEN);
     67    void deleteOwnedPtr(HRGN);
     68#endif
     69
     70#if PLATFORM(BREWMP)
     71    void deleteOwnedPtr(IFileMgr*);
     72    void deleteOwnedPtr(IFile*);
     73    void deleteOwnedPtr(IBitmap*);
     74    void deleteOwnedPtr(ISSL*);
     75    void deleteOwnedPtr(ISocket*);
     76#endif
     77
    4078} // namespace WTF
    4179
    42 #if PLATFORM(BREWMP)
    43 #include <wtf/brew/OwnPtrBrew.h>
    44 #elif PLATFORM(WIN)
    45 #include <wtf/win/OwnPtrWin.h>
    46 #endif
    47 
    4880#endif // WTF_OwnPtrCommon_h
Note: See TracChangeset for help on using the changeset viewer.