bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-25 16:37:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Linux/OS-X compile errors (issue #751).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@898 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-11-05 20:19:50 +00:00
parent d7493c57a1
commit cd87a0b38a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cef1/cef.gyp
View File

@ -14,7 +14,7 @@
'<!(python ../chrome/tools/build/version.py -f ../chrome/VERSION -t "1<(revision).@BUILD_HI@.@BUILD_LO@" -e "BUILD_HI=int(BUILD)/256" -e "BUILD_LO=int(BUILD)%256")', '<!(python ../chrome/tools/build/version.py -f ../chrome/VERSION -t "1<(revision).@BUILD_HI@.@BUILD_LO@" -e "BUILD_HI=int(BUILD)/256" -e "BUILD_LO=int(BUILD)%256")',
}, },
'conditions': [ 'conditions': [
[ 'os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', { [ 'os_posix==1 and OS!="mac" and OS!="android" and gcc_version>=46', {
'target_defaults': { 'target_defaults': {
# Disable warnings about c++0x compatibility, as some names (such # Disable warnings about c++0x compatibility, as some names (such
# as nullptr) conflict with upcoming c++0x types. # as nullptr) conflict with upcoming c++0x types.

4
cef1/include/internal/cef_types_wrappers.h
View File

@ -507,8 +507,8 @@ class CefTime : public CefStructBase<CefTimeTraits> {
} }
// Return the delta between this object and |other| in milliseconds. // Return the delta between this object and |other| in milliseconds.
int64 Delta(const CefTime& other) { long long Delta(const CefTime& other) {
int64 delta = 0; long long delta = 0;
cef_time_delta(this, &other, &delta); cef_time_delta(this, &other, &delta);
return delta; return delta;
} }