bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix gcc 4.6 and 64 bit compile errors (issue #40). 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@374 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2011-11-12 00:06:03 +00:00
parent 82da0fbb38
commit 1dab15313a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cef.gyp
View File

@ -9,6 +9,15 @@
'repack_locales_cmd': ['python', 'tools/repack_locales.py'], 'repack_locales_cmd': ['python', 'tools/repack_locales.py'],
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/cef', 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/cef',
}, },
'conditions': [
[ 'os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', {
'target_defaults': {
# Disable warnings about c++0x compatibility, as some names (such
# as nullptr) conflict with upcoming c++0x types.
'cflags_cc': ['-Wno-c++0x-compat'],
},
}],
],
'includes': [ 'includes': [
# Bring in the source file lists for cefclient. # Bring in the source file lists for cefclient.
'cef_paths.gypi', 'cef_paths.gypi',

3
libcef/browser_webview_delegate_gtk.cc
View File

@ -121,7 +121,8 @@ static GtkWidget* MenuItemCreate(GtkWidget* parent_menu, const char* name,
{ {
GtkWidget* menu_item = gtk_menu_item_new_with_label(name); GtkWidget* menu_item = gtk_menu_item_new_with_label(name);
g_object_set_data(G_OBJECT(menu_item), "menu_id", (gpointer)id); g_object_set_data(G_OBJECT(menu_item), "menu_id",
reinterpret_cast<gpointer>(id));
g_signal_connect(G_OBJECT(menu_item), "activate", G_CALLBACK(MenuItemHandle), g_signal_connect(G_OBJECT(menu_item), "activate", G_CALLBACK(MenuItemHandle),
(gpointer)webViewDelegate); (gpointer)webViewDelegate);
gtk_menu_shell_append(GTK_MENU_SHELL(parent_menu), menu_item); gtk_menu_shell_append(GTK_MENU_SHELL(parent_menu), menu_item);