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/user32/icon.cpp

    r9851 r21916  
    2121#include <string.h>
    2222#include <stdlib.h>
     23#include <string.h>
     24#ifndef __EMX__
    2325#include <iostream.h>
    24 #include <string.h>
     26#endif
    2527
    2628#include <win32api.h>
    … …  
    271273  return (void *)iconhdr;
    272274}
     275
     276extern "C" {
     277
    273278//******************************************************************************
    274279//******************************************************************************
    … …  
    465470//******************************************************************************
    466471//******************************************************************************
     472
     473} // extern "C"
Note: See TracChangeset for help on using the changeset viewer.