"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "tools/depends/target/mariadb/01-android.patch" between
xbmc-18.7.1-Leia.tar.gz and xbmc-18.8-Leia.tar.gz

About: XBMC is a software media player and entertainment hub for digital media that plays almost all popular audio and video formats around (new name "Kodi").

01-android.patch  (xbmc-18.7.1-Leia):01-android.patch  (xbmc-18.8-Leia)
--- a/cmake/CheckIncludeFiles.cmake --- a/cmake/CheckIncludeFiles.cmake
+++ b/cmake/CheckIncludeFiles.cmake +++ b/cmake/CheckIncludeFiles.cmake
@@ -74,3 +74,12 @@ @@ -50,4 +50,11 @@
CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H) CHECK_INCLUDE_FILES (ucontext.h HAVE_FILE_UCONTEXT_H)
CHECK_INCLUDE_FILES (utime.h HAVE_UTIME_H) IF(NOT HAVE_FILE_UCONTEXT_H)
CHECK_INCLUDE_FILES (ucontext.h HAVE_UCONTEXT_H) CHECK_INCLUDE_FILES (sys/ucontext.h HAVE_FILE_UCONTEXT_H)
+IF(HAVE_UCONTEXT_H)
+ CHECK_FUNCTION_EXISTS (getcontext HAVE_GETCONTEXT) + CHECK_FUNCTION_EXISTS (getcontext HAVE_GETCONTEXT)
+ CHECK_FUNCTION_EXISTS (makecontext HAVE_MAKECONTEXT) + CHECK_FUNCTION_EXISTS (makecontext HAVE_MAKECONTEXT)
+ CHECK_FUNCTION_EXISTS (setcontext HAVE_SETCONTEXT) + CHECK_FUNCTION_EXISTS (setcontext HAVE_SETCONTEXT)
+ CHECK_FUNCTION_EXISTS (swapcontext HAVE_SWAPCONTEXT) + CHECK_FUNCTION_EXISTS (swapcontext HAVE_SWAPCONTEXT)
+ IF(NOT HAVE_GETCONTEXT OR NOT HAVE_MAKECONTEXT OR NOT HAVE_SETCONTEXT OR NOT HAVE_SWAPCONTEXT) + IF(NOT HAVE_GETCONTEXT OR NOT HAVE_MAKECONTEXT OR NOT HAVE_SETCONTEXT OR NOT HAVE_SWAPCONTEXT)
+ SET(HAVE_UCONTEXT_H 0 CACHE INTERNAL "") + SET(HAVE_UCONTEXT_H 0 CACHE INTERNAL "")
+ ENDIF() + ENDIF()
+ENDIF(HAVE_UCONTEXT_H) ENDIF()
--- a/cmake/CheckTypes.cmake --- a/cmake/CheckTypes.cmake
+++ b/cmake/CheckTypes.cmake +++ b/cmake/CheckTypes.cmake
@@ -25,6 +25,7 @@ @@ -22,6 +22,7 @@
CHECK_TYPE_SIZE(off_t SIZEOF_OFF_T) SET(CMAKE_EXTRA_INCLUDE_FILES sys/types.h)
CHECK_TYPE_SIZE(uchar SIZEOF_UCHAR) CHECK_TYPE_SIZE(uchar SIZEOF_UCHAR)
CHECK_TYPE_SIZE(uint SIZEOF_UINT) CHECK_TYPE_SIZE(uint SIZEOF_UINT)
+CHECK_TYPE_SIZE(ushort SIZEOF_USHORT) +CHECK_TYPE_SIZE(ushort SIZEOF_USHORT)
CHECK_TYPE_SIZE(ulong SIZEOF_ULONG) CHECK_TYPE_SIZE(ulong SIZEOF_ULONG)
CHECK_TYPE_SIZE(int8 SIZEOF_INT8) CHECK_TYPE_SIZE(int8 SIZEOF_INT8)
CHECK_TYPE_SIZE(uint8 SIZEOF_UINT8) CHECK_TYPE_SIZE(uint8 SIZEOF_UINT8)
--- a/include/ma_config.h.in --- a/include/ma_config.h.in
+++ b/include/ma_config.h.in +++ b/include/ma_config.h.in
@@ -217,6 +217,11 @@ @@ -85,6 +85,11 @@
# define HAVE_UINT 1 # define HAVE_UINT 1
#endif #endif
+#cmakedefine SIZEOF_USHORT @SIZEOF_USHORT@ +#cmakedefine SIZEOF_USHORT @SIZEOF_USHORT@
+#if SIZEOF_USHORT +#if SIZEOF_USHORT
+# define HAVE_USHORT 1 +# define HAVE_USHORT 1
+#endif +#endif
+ +
#cmakedefine SIZEOF_ULONG @SIZEOF_ULONG@ #cmakedefine SIZEOF_ULONG @SIZEOF_ULONG@
#if SIZEOF_ULONG #if defined(SIZEOF_ULONG)
# define HAVE_ULONG 1 # define HAVE_ULONG 1
--- a/include/ma_global.h --- a/include/ma_global.h
+++ b/include/ma_global.h +++ b/include/ma_global.h
@@ -272,6 +272,8 @@ @@ -268,6 +268,8 @@
#if defined(__EMX__) || !defined(HAVE_UINT) #if defined(__EMX__) || !defined(HAVE_UINT)
typedef unsigned int uint; typedef unsigned int uint;
+#endif +#endif
+#if defined(__EMX__) || !defined(HAVE_USHORT) +#if defined(__EMX__) || !defined(HAVE_USHORT)
typedef unsigned short ushort; typedef unsigned short ushort;
#endif #endif
--- a/libmariadb/CMakeLists.txt --- a/libmariadb/CMakeLists.txt
+++ b/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt
@@ -291,7 +291,6 @@ ELSE() @@ -311,7 +311,6 @@
IF(ICONV_INCLUDE_DIR) IF(ICONV_INCLUDE_DIR)
INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR}) INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR})
ENDIF() ENDIF()
- ADD_DEFINITIONS(-DLIBICONV_PLUG) - ADD_DEFINITIONS(-DLIBICONV_PLUG)
ENDIF() ENDIF()
IF(ZLIB_FOUND AND WITH_EXTERNAL_ZLIB) IF(ZLIB_FOUND AND WITH_EXTERNAL_ZLIB)
 End of changes. 7 change blocks. 
12 lines changed or deleted 11 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)