← Back to branch summary

~ubuntu-branches/ubuntu/raring/openmotif/raring-proposed

« back to all changes in this revision

Viewing changes to lib/Xm/IconFile.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bauer
  • Date: 2010-06-29 09:42:21 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100629094221-yee9gtet2dngu6cv
Tags: 2.3.3-1
http://bugs.debian.org/587461
* New upstream release
* Drop patch for autoconf-bug as this was fixed upstream
* Applied patch to fix implicit pointer conversion (Closes: #587461)
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Xm/IconFile.c
77
77
 
78
78
#include "ImageCachI.h"
79
79
 
 
80
#define FIX_1427
 
81
 
80
82
/**************** vendor dependant defaults ********/
81
83
/* All this stuff (cached dir) should be moved and possibly merged
82
84
   in Xmos.c, where it belongs */
722
724
                memmove(&fileName[0],
723
725
                        iNameEntry->dirName,
724
726
                        dirLen);
 
727
#ifdef FIX_1427
 
728
                if (dirLen == 0) {
 
729
                        memmove(&fileName[dirLen], iNameEntry->leafName, leafLen);
 
730
                        fileName[dirLen + leafLen] = '\0';
 
731
                } else {
 
732
#endif
725
733
                fileName[dirLen] = '/';
726
734
                memmove(&fileName[dirLen + 1],
727
735
                        iNameEntry->leafName,
728
736
                        leafLen);
729
737
 
730
738
                fileName[dirLen + leafLen + 1] = '\0';
 
739
#ifdef FIX_1427
 
740
                }
 
741
#endif
731
742
            }
732
743
        }
733
744