[BACK]Return to malloca.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libiconv / srclib

Diff for /embedaddon/libiconv/srclib/malloca.h between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 22:57:48 version 1.1.1.2, 2012/05/29 09:29:43
Line 1 Line 1
 /* Safe automatic memory allocation.  /* Safe automatic memory allocation.
   Copyright (C) 2003-2007 Free Software Foundation, Inc.   Copyright (C) 2003-2007, 2009-2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.     Written by Bruno Haible <bruno@clisp.org>, 2003.
   
    This program is free software; you can redistribute it and/or modify     This program is free software; you can redistribute it and/or modify
Line 54  extern "C" { Line 54  extern "C" {
    the function returns.  Upon failure, it returns NULL.  */     the function returns.  Upon failure, it returns NULL.  */
 #if HAVE_ALLOCA  #if HAVE_ALLOCA
 # define malloca(N) \  # define malloca(N) \
  ((N) < 4032 - sa_increment                                        \  ((N) < 4032 - sa_increment                                        \
    ? (void *) ((char *) alloca ((N) + sa_increment) + sa_increment) \     ? (void *) ((char *) alloca ((N) + sa_increment) + sa_increment) \
    : mmalloca (N))     : mmalloca (N))
 #else  #else
Line 122  enum Line 122  enum
   sa_alignment_longdouble = sa_alignof (long double),    sa_alignment_longdouble = sa_alignof (long double),
   sa_alignment_max = ((sa_alignment_long - 1) | (sa_alignment_double - 1)    sa_alignment_max = ((sa_alignment_long - 1) | (sa_alignment_double - 1)
 #if HAVE_LONG_LONG_INT  #if HAVE_LONG_LONG_INT
                      | (sa_alignment_longlong - 1)                      | (sa_alignment_longlong - 1)
 #endif  #endif
                      | (sa_alignment_longdouble - 1)                      | (sa_alignment_longdouble - 1)
                     ) + 1,                     ) + 1,
 /* The increment that guarantees room for a magic word must be >= sizeof (int)  /* The increment that guarantees room for a magic word must be >= sizeof (int)
    and a multiple of sa_alignment_max.  */     and a multiple of sa_alignment_max.  */
   sa_increment = ((sizeof (int) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max    sa_increment = ((sizeof (int) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>