Fixed compile errors on Linux. Issue 146.

cztomczak · cztomczak · commit 12b51035c66d · 2014-12-03T18:18:43.000+01:00
diff --git a/cefpython/cef3/LOG_DEBUG.h b/cefpython/cef3/LOG_DEBUG.h
@@ -196,7 +196,7 @@ inline std::string NowTime()
     struct timeval tv;
     gettimeofday(&tv, 0);
     char result[100] = {0};
-    std::sprintf(result, "%s.%03ld", buffer, (long)tv.tv_usec / 1000); 
+    sprintf(result, "%s.%03ld", buffer, (long)tv.tv_usec / 1000); 
     return result;
 }
 
diff --git a/cefpython/cef3/linux/setup/cefpython.h b/cefpython/cef3/linux/setup/cefpython.h
@@ -13,13 +13,17 @@
 #endif
 
 __PYX_EXTERN_C DL_IMPORT(void) PyBrowser_ShowDevTools(CefRefPtr<CefBrowser>);
+__PYX_EXTERN_C DL_IMPORT(void) PyTaskRunnable(int);
 __PYX_EXTERN_C DL_IMPORT(void) V8ContextHandler_OnContextCreated(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>);
 __PYX_EXTERN_C DL_IMPORT(void) V8ContextHandler_OnContextReleased(int, int64);
 __PYX_EXTERN_C DL_IMPORT(void) V8FunctionHandler_Execute(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefString &, CefRefPtr<CefListValue>);
 __PYX_EXTERN_C DL_IMPORT(void) RemovePythonCallbacksForFrame(int);
 __PYX_EXTERN_C DL_IMPORT(bool) ExecutePythonCallback(CefRefPtr<CefBrowser>, int, CefRefPtr<CefListValue>);
-__PYX_EXTERN_C DL_IMPORT(void) LifespanHandler_OnBeforeClose(CefRefPtr<CefBrowser>);
 __PYX_EXTERN_C DL_IMPORT(bool) LifespanHandler_OnBeforePopup(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefString const &, CefString const &, int const , CefWindowInfo &, CefRefPtr<CefClient> &, CefBrowserSettings &, bool *);
+__PYX_EXTERN_C DL_IMPORT(void) LifespanHandler_OnAfterCreated(CefRefPtr<CefBrowser>);
+__PYX_EXTERN_C DL_IMPORT(bool) LifespanHandler_RunModal(CefRefPtr<CefBrowser>);
+__PYX_EXTERN_C DL_IMPORT(bool) LifespanHandler_DoClose(CefRefPtr<CefBrowser>);
+__PYX_EXTERN_C DL_IMPORT(void) LifespanHandler_OnBeforeClose(CefRefPtr<CefBrowser>);
 __PYX_EXTERN_C DL_IMPORT(void) DisplayHandler_OnAddressChange(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefString const &);
 __PYX_EXTERN_C DL_IMPORT(void) DisplayHandler_OnTitleChange(CefRefPtr<CefBrowser>, CefString const &);
 __PYX_EXTERN_C DL_IMPORT(bool) DisplayHandler_OnTooltip(CefRefPtr<CefBrowser>, CefString &);
@@ -75,6 +79,8 @@ __PYX_EXTERN_C DL_IMPORT(void) JavascriptDialogHandler_OnJavascriptDialogClosed(
 __PYX_EXTERN_C DL_IMPORT(void) cefpython_GetDebugOptions(bool *, std::string *);
 __PYX_EXTERN_C DL_IMPORT(bool) ApplicationSettings_GetBool(char const *);
 __PYX_EXTERN_C DL_IMPORT(bool) ApplicationSettings_GetBoolFromDict(char const *, char const *);
+__PYX_EXTERN_C DL_IMPORT(std::string) ApplicationSettings_GetString(char const *);
+__PYX_EXTERN_C DL_IMPORT(int) CommandLineSwitches_GetInt(char const *);
 
 #endif /* !__PYX_HAVE_API__cefpython_py27 */
 
diff --git a/cefpython/cef3/subprocess/cefpython_app.cpp b/cefpython/cef3/subprocess/cefpython_app.cpp
@@ -13,7 +13,7 @@
 #include "util.h"
 #include "include/cef_runnable.h"
 #include "DebugLog.h"
-#include "LOG_DEBUG"
+#include "LOG_DEBUG.h"
 #include <vector>
 #include <algorithm>
 #include "v8utils.h"
diff --git a/cefpython/string_utils.pyx b/cefpython/string_utils.pyx
@@ -45,7 +45,7 @@ cdef py_string CharToPyString(
 #                 g_applicationSettings["string_encoding"],
 #                 errors=BYTES_DECODE_ERRORS))
 
-# cdef cpp_string PyToCppString(py_string pyString):
+# cdef cpp_string PyToCppString(py_string pyString) except *:
 #     cdef cpp_string cppString = pyString
 #     return cppString
 

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ inline std::string NowTime()`
`196`	`196`	`struct timeval tv;`
`197`	`197`	`gettimeofday(&tv, 0);`
`198`	`198`	`char result[100] = {0};`
`199`		`- std::sprintf(result, "%s.%03ld", buffer, (long)tv.tv_usec / 1000);`
	`199`	`+ sprintf(result, "%s.%03ld", buffer, (long)tv.tv_usec / 1000);`
`200`	`200`	`return result;`
`201`	`201`	`}`
`202`	`202`