81 lines
2.9 KiB
Diff
81 lines
2.9 KiB
Diff
fix build error with gcc-4.4
|
|
|
|
--- xbmc/visualizations/XBMCProjectM/libprojectM/BuiltinParams.cpp
|
|
+++ xbmc/visualizations/XBMCProjectM/libprojectM/BuiltinParams.cpp
|
|
@@ -1,3 +1,4 @@
|
|
+#include <stdio.h>
|
|
|
|
#include "fatal.h"
|
|
#include "BuiltinParams.hpp"
|
|
|
|
http://xbmc.org/trac/ticket/6627
|
|
|
|
--- xbmc/cores/DllLoader/exports/exports_msvcrt.cpp
|
|
+++ xbmc/cores/DllLoader/exports/exports_msvcrt.cpp
|
|
@@ -307,6 +307,14 @@
|
|
extern "C" void* track_fopen();
|
|
extern "C" void* track_freopen();
|
|
|
|
+#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
|
|
+#define strchr __builtin_strchr
|
|
+#define strrchr __builtin_strrchr
|
|
+#define strpbrk __builtin_strpbrk
|
|
+#define strstr __builtin_strstr
|
|
+#define memchr __builtin_memchr
|
|
+#endif
|
|
+
|
|
Export export_msvcrt[] =
|
|
{
|
|
{ "_close", -1, (void*)dll_close, (void*)track_close},
|
|
|
|
--- tools/XBMCTex/XBMCTex.cpp
|
|
+++ tools/XBMCTex/XBMCTex.cpp
|
|
@@ -659,7 +659,7 @@
|
|
valid = true;
|
|
#ifdef _LINUX
|
|
char *c = NULL;
|
|
- while ((c = strchr(OutputFilename, '\\')) != NULL) *c = '/';
|
|
+ while ((c = (char *)strchr(OutputFilename, '\\')) != NULL) *c = '/';
|
|
#endif
|
|
}
|
|
else if (!stricmp(args[i], "-noprotect") || !stricmp(args[i], "-p"))
|
|
|
|
--- xbmc/cores/paplayer/MACDll/Source/MACLib/APELink.cpp
|
|
+++ xbmc/cores/paplayer/MACDll/Source/MACLib/APELink.cpp
|
|
@@ -55,10 +55,10 @@
|
|
if (pData != NULL)
|
|
{
|
|
// parse out the information
|
|
- char * pHeader = strstr(pData, APE_LINK_HEADER);
|
|
- char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
|
|
- char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
|
|
- char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
|
|
+ const char * pHeader = strstr(pData, APE_LINK_HEADER);
|
|
+ const char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
|
|
+ const char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
|
|
+ const char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
|
|
|
|
if (pHeader && pImageFile && pStartBlock && pFinishBlock)
|
|
{
|
|
@@ -73,7 +73,7 @@
|
|
|
|
// get the path
|
|
char cImageFile[MAX_PATH + 1]; int nIndex = 0;
|
|
- char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
|
|
+ const char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
|
|
while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n'))
|
|
cImageFile[nIndex++] = *pImageCharacter++;
|
|
cImageFile[nIndex] = 0;
|
|
|
|
--- xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp
|
|
+++ xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp
|
|
@@ -51,7 +51,7 @@
|
|
// helper functions
|
|
DWORD GetImageType(const char *file)
|
|
{ // determines based on file extension the type of file
|
|
- char *ext = (char *)file + strlen(file) - 1;
|
|
+ const char *ext = file + strlen(file) - 1;
|
|
while (ext > file)
|
|
{
|
|
if (*ext == '.')
|