package/audio/mac/hotfix-gcc44.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../mac/gcc44.patch
   5 # Copyright (C) 2010 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 diff -Nur mac-3.99-u4-b5-orig/src/MACLib/APELink.cpp mac-3.99-u4-b5/src/MACLib/APELink.cpp
  18 --- mac-3.99-u4-b5-orig/src/MACLib/APELink.cpp  2010-08-11 16:17:26.472081342 +0000
  19 +++ mac-3.99-u4-b5/src/MACLib/APELink.cpp       2010-08-11 16:23:27.071079896 +0000
  20 @@ -63,10 +63,10 @@
  21      if (pData != NULL)
  22      {
  23          // parse out the information
  24 -        char * pHeader = strstr(pData, APE_LINK_HEADER);
  25 -        char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
  26 -        char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
  27 -        char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
  28 +        const char * pHeader = strstr(pData, APE_LINK_HEADER);
  29 +        const char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
  30 +        const char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
  31 +        const char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
  32
  33          if (pHeader && pImageFile && pStartBlock && pFinishBlock)
  34          {
  35 @@ -81,7 +81,7 @@
  36
  37                  // get the path
  38                  char cImageFile[MAX_PATH + 1]; int nIndex = 0;
  39 -                char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
  40 +                const char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
  41                  while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n'))
  42                      cImageFile[nIndex++] = *pImageCharacter++;
  43                  cImageFile[nIndex] = 0;