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/oleaut32/libgif/egif_lib.c

    r10266 r21916  
    1515#include <io.h>
    1616#include <alloc.h>
    17 #include <sys\stat.h>
     17#include <sys/stat.h>
    1818#else
    1919#include <sys/types.h>
    … …  
    137137    Private->File = f;
    138138    Private->FileState = FILE_STATE_WRITE;
    139    
     139
    140140    Private->Write = (OutputFunc)0; /* No user write routine (MRB) */
    141141    GifFile->UserData = (VoidPtr)0; /* No user write handle (MRB) */
    142    
     142
    143143    _GifError = 0;
    144144
    … …  
    173173    Private->File = (FILE *)0;
    174174    Private->FileState = FILE_STATE_WRITE;
    175    
     175
    176176    Private->Write = writeFunc; /* User write routine (MRB) */
    177177    GifFile->UserData = userData; /* User write handle (MRB) */
    178    
     178
    179179    _GifError = 0;
    180180
    … …  
    825825        if (sp->RasterBits == NULL)
    826826            continue;
    827        
     827
    828828    if (sp->ExtensionBlocks)
    829829        {
Note: See TracChangeset for help on using the changeset viewer.