mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 13:41:26 +00:00
a5386213ad
Regression introduced by 1ded0cb24c.
The package defines macros for min() and max(), but those macros are
undefined by the inclusion of stdlib.h since GCC 6.x, so we need to
change tho order of inclusions to include stdlib.h *before* NoWindows.h.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
50 lines
2 KiB
Diff
50 lines
2 KiB
Diff
diff --git a/src/MACLib/APELink.cpp b/src/MACLib/APELink.cpp
|
|
index d349f4b..b00ec83 100644
|
|
--- a/src/MACLib/APELink.cpp
|
|
+++ b/src/MACLib/APELink.cpp
|
|
@@ -63,10 +63,10 @@ void CAPELink::ParseData(const char * pData, const str_utf16 * pFilename)
|
|
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)
|
|
{
|
|
@@ -81,7 +81,7 @@ void CAPELink::ParseData(const char * pData, const str_utf16 * pFilename)
|
|
|
|
// 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;
|
|
diff --git a/src/Shared/All.h b/src/Shared/All.h
|
|
index 328addc..7730e89 100644
|
|
--- a/src/Shared/All.h
|
|
+++ b/src/Shared/All.h
|
|
@@ -21,6 +21,8 @@ Global includes
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
+#include <stdlib.h>
|
|
+
|
|
#ifdef _WIN32
|
|
#include <mmsystem.h>
|
|
#include <tchar.h>
|
|
@@ -34,7 +36,6 @@ Global includes
|
|
#include "NoWindows.h"
|
|
#endif
|
|
|
|
-#include <stdlib.h>
|
|
#include <memory.h>
|
|
#include <stdio.h>
|
|
#include <math.h>
|