Changeset 2591 for trunk/src/kmk/glob


Ignore:
Timestamp:
Jun 17, 2012, 10:45:31 PM (13 years ago)
Author:
bird
Message:

kmk: Merged in changes from GNU make 3.82. Previous GNU make base version was gnumake-2008-10-28-CVS.

Location:
trunk/src/kmk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kmk

    • Property svn:ignore

      •  

        old new  
        1313stamp-*
        1414makebook*
         15
        1516.*gdbinit
         17.gdb_history
         18
        1619*.dep
        1720*.dvi
        … …  
        3134*.pg
        3235*.pgs
         36
        3337README
        3438README.DOS
        3539README.W32
         40README.OS2
        3641aclocal.m4
        3742autom4te.cache
        … …  
        5257config.h.W32
        5358config.h-vms
         59
        5460loadavg
        5561loadavg.c
        5662make
         63
        5764.deps
        5865.dep_segment
         66ID
         67TAGS
         68
        5969_*
        6070sun4
        … …  
        7282sol2
        7383i486-linux
         84
        7485customs
         86
        7587install-sh
        7688mkinstalldirs
         89
         90.directive.asc

  • trunk/src/kmk/glob

    • Property svn:ignore
      --- 
+++

  • trunk/src/kmk/glob/ChangeLog

    r1993 r2591  
     12008-09-28  Juan Manuel Guerrero  <juan.guerrero@gmx.de>
     2
     3        * glob.c (my_realloc) [__DJGPP__]: Don't define, and don't
     4        redefine realloc to call it, since the DJGPP's realloc handles
     5        NULL pointers correctly.
     6
    172007-12-22  Juan Manuel Guerrero  <juan.guerrero@gmx.de>  (tiny change)
    28
    3         * glob/glob.c [__GNU_LIBRARY__ && __DJGPP__]: Add a realloc
     9        * glob.c [__GNU_LIBRARY__ && __DJGPP__]: Add a realloc
    410        declaration that matches the one in the DJGPP libc.
    511

  • trunk/src/kmk/glob/glob.c

    r2001 r2591  
    183183#endif
    184184
    185 #if !defined(__GNU_LIBRARY__) && !defined(ELECTRIC_HEAP) && !defined(__APPLE__) /* bird (last two) */
     185#if !defined __GNU_LIBRARY__ && !defined __DJGPP__ && !defined ELECTRIC_HEAP && !defined __APPLE__ /* bird (last two) */
    186186# ifdef __GNUC__
    187187__inline
    … …  
    192192static void *
    193193my_realloc (void *p, unsigned int n)
    194 #  elif defined(__DJGPP__)
    195 static void *
    196 my_realloc (void *p, size_t n)
    197194#  else
    198195static char *
    … …  
    210207# define        realloc my_realloc
    211208# endif /* __SASC */
    212 #endif /* __GNU_LIBRARY__ */
     209#endif /* __GNU_LIBRARY__ || __DJGPP__ */
    213210
    214211
    … …  
    390387          /* Allocate working buffer large enough for our work.  Note that
    391388            we have at least an opening and closing brace.  */
    392           size_t firstc;
     389          size_t firstc;  /* bird: correct type. */
    393390          char *alt_start;
    394391          const char *p;
Note: See TracChangeset for help on using the changeset viewer.