Changeset 21916 for trunk/tools/wrc


Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
3 deleted
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/tools/wrc/newstruc.c

    r6110 r21916  
    744744        /* FIXME: This relies in sizeof(DWORD) == sizeof(pointer_type) */
    745745        if((DWORD)rtp & 1)
    746             #if !defined(__IBMC__)
    747                 ((char *)rtp)++;
    748             #else
    749                 rtp = (riff_tag_t*)((char*)rtp + 1);
    750             #endif
     746            rtp = (riff_tag_t*)((char*)rtp + 1);
    751747    }
    752748}
    … …  
    859855            /* FIXME: This relies in sizeof(DWORD) == sizeof(pointer_type) */
    860856            if((DWORD)rtp & 1)
    861                 #if !defined(__IBMC__)
    862                     ((char *)rtp)++;
    863                 #else
    864                     rtp = (riff_tag_t*)((char*)rtp + 1);
    865                 #endif
     857                rtp = (riff_tag_t*)((char*)rtp + 1);
    866858        }
    867859

  • trunk/tools/wrc/wrc.c

    r21589 r21916  
    261261resource_t *resource_top;   /* The top of the parsed resources */
    262262
    263 #ifdef __EMX__
    264 int getopt (int argc, char **argv, const char *optstring);
    265 #else
    266 int getopt (int argc, char *const *argv, const char *optstring);
     263#ifndef __GNUC__
     264int getopt(int argc, char *const *argv, const char *optstring);
    267265#endif
    268266
Note: See TracChangeset for help on using the changeset viewer.