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/src/crypt32/crypt32_private.h

    r21354 r21916  
    401401 */
    402402
    403 int vsnprintf (char *buf, int n, const char *fmt, va_list args);
    404 int snprintf (char *buf, int n, const char *fmt, ...);
     403int crypt32_vsnprintf (char *buf, int n, const char *fmt, va_list args);
     404int crypt32_snprintf (char *buf, int n, const char *fmt, ...);
    405405
    406406#endif
Note: See TracChangeset for help on using the changeset viewer.