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

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

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/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.