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

    r4601 r21916  
    1919#define __DIB_H__
    2020
    21 //must use WIN32API as it's exported
     21#ifdef __cplusplus
     22extern "C" {
     23#endif
     24
     25// must use WIN32API as it's exported
    2226int WIN32API DIB_GetDIBWidthBytes( int width, int depth );
     27int  WIN32API BITMAP_GetWidthBytes( INT width, INT depth );
     28
     29#ifdef __cplusplus
     30} // extern "C"
     31#endif
    2332
    2433int DIB_GetDIBImageBytes( int width, int height, int depth );
    … …  
    2736                              int *height, WORD *bpp, WORD *compr );
    2837void DIB_FixColorsToLoadflags(BITMAPINFO * bmi, UINT loadflags, BYTE pix);
    29 int  WIN32API BITMAP_GetWidthBytes( INT width, INT depth );
    3038
    3139#endif
Note: See TracChangeset for help on using the changeset viewer.