Changeset 21916 for trunk/src/msvcrt


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

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
5 deleted
4 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/src/msvcrt/dir.c

    r21631 r21916  
    2121 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2222 */
     23
    2324#ifdef __WIN32OS2__
    24 #include <emxheader.h>
    2525#include <stdlib.h>
    2626#include <string.h>
    2727#include <ctype.h>
    2828#include <winbase.h>
     29#include "emxheader.h"
    2930#else
    3031#include "config.h"

  • trunk/src/msvcrt/file.c

    r21506 r21916  
    2121 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2222 */
     23
    2324#ifdef __WIN32OS2__
    24 #include <emxheader.h>
    2525#include <winbase.h>
     26#include "emxheader.h"
    2627#else
    2728#include "config.h"

  • trunk/src/msvcrt/time.c

    r21395 r21916  
    2525#include <unistd.h>
    2626#include <time.h>
    27 #include <sys\times.h>
     27#include <sys/times.h>
    2828#else
    2929#include "config.h"
Note: See TracChangeset for help on using the changeset viewer.