Merge pull request #523 from trompa/CMDLine

nethip · nethip · commit 42e053285826 · 2015-04-28T12:48:38.000-07:00
Fix compilation on Linux InstallCommandLineTools not in scope
diff --git a/appshell/appshell_extensions_platform.h b/appshell/appshell_extensions_platform.h
@@ -73,8 +73,8 @@ inline void* getMenuParent(CefRefPtr<CefBrowser>browser) {
     return gtk_widget_get_ancestor(
         GTK_WIDGET(browser->GetHost()->GetWindowHandle()),
         GTK_TYPE_VBOX);
-inline int32 InstallCommandLineTools() { return ERR_CL_TOOLS_NOTSUPPORTED; }
 }
+inline int32 InstallCommandLineTools() { return ERR_CL_TOOLS_NOTSUPPORTED; }
 #endif
 
 

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ inline void* getMenuParent(CefRefPtr<CefBrowser>browser) {`
`73`	`73`	`return gtk_widget_get_ancestor(`
`74`	`74`	`GTK_WIDGET(browser->GetHost()->GetWindowHandle()),`
`75`	`75`	`GTK_TYPE_VBOX);`
`76`		`-inline int32 InstallCommandLineTools() { return ERR_CL_TOOLS_NOTSUPPORTED; }`
`77`	`76`	`}`
	`77`	`+inline int32 InstallCommandLineTools() { return ERR_CL_TOOLS_NOTSUPPORTED; }`
`78`	`78`	`#endif`
`79`	`79`
`80`	`80`