src/rebase/patches/0001-Fix-for-stricter-g.patch

   1 From 599129078e624f0026090b6efc1f3782401b02bf Mon Sep 17 00:00:00 2001
   2 From: Johannes Schindelin <johannes.schindelin@gmx.de>
   3 Date: Thu, 21 Feb 2008 17:34:11 +0000
   4 Subject: [PATCH 1/1] Fix for stricter g++
   5
   6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
   7 ---
   8  imagehelper/sections.cc |    6 +++---
   9  1 files changed, 3 insertions(+), 3 deletions(-)
  10
  11 diff --git a/imagehelper/sections.cc b/imagehelper/sections.cc
  12 index 9dee579..d981555 100644
  13 --- a/imagehelper/sections.cc
  14 +++ b/imagehelper/sections.cc
  15 @@ -285,7 +285,7 @@ bool Relocations::check(void)
  16    if (debug)
  17      std::cerr << "debug: checking relocations .... " << std::endl;
  18
  19 -  for (; (char *)&relocp->SizeOfBlock < (char *)relocs + size && relocp->SizeOfBlock != 0; ((char *)relocp) += relocp->SizeOfBlock)
  20 +  for (; (char *)&relocp->SizeOfBlock < (char *)relocs + size && relocp->SizeOfBlock != 0; relocp = (PIMAGE_BASE_RELOCATION)(((char *)relocp) + relocp->SizeOfBlock))
  21      {
  22        int NumOfRelocs = (relocp->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) / sizeof (WORD);
  23        int va = relocp->VirtualAddress;
  24 @@ -328,7 +328,7 @@ bool Relocations::fix(void)
  25    if (debug)
  26      std::cerr << "warning: fixing bad relocations .... ";
  27
  28 -  for (; (char *)&relocp->SizeOfBlock < (char *)relocs + size && relocp->SizeOfBlock != 0; ((char *)relocp) += relocp->SizeOfBlock)
  29 +  for (; (char *)&relocp->SizeOfBlock < (char *)relocs + size && relocp->SizeOfBlock != 0; relocp = (PIMAGE_BASE_RELOCATION)(((char *)relocp) + relocp->SizeOfBlock))
  30      {
  31        int NumOfRelocs = (relocp->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) / sizeof (WORD);
  32        int va = relocp->VirtualAddress;
  33 @@ -363,7 +363,7 @@ bool Relocations::relocate(int difference)
  34    if (!relocs)
  35      return false;
  36
  37 -  for (; (char *)&relocp->SizeOfBlock < (char *)relocs + size && relocp->SizeOfBlock != 0; ((char *)relocp) += relocp->SizeOfBlock)
  38 +  for (; (char *)&relocp->SizeOfBlock < (char *)relocs + size && relocp->SizeOfBlock != 0; relocp = (PIMAGE_BASE_RELOCATION)(((char *)relocp) + relocp->SizeOfBlock))
  39      {
  40        int NumOfRelocs = (relocp->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) / sizeof (WORD);
  41        int va = relocp->VirtualAddress;
  42 --
  43 1.5.3.6.2529.ga176-dirty
  44