* lib/sincosl.c (kernel_sinl): Fix typo in threshold.

[gnulib.git] / lib / linebreak.c

diff --git a/lib/linebreak.c b/lib/linebreak.c
index 78fb657..09f110c 100644 (file)
--- a/lib/linebreak.c
+++ b/lib/linebreak.c
@@ -1,5 +1,5 @@
 /* linebreak.c - line breaking of Unicode strings
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
 This program is free software; you can redistribute it and/or modify
@@ -13,12 +13,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+along with this program; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "linebreak.h"
@@ -1024,7 +1022,7 @@ u8_width_linebreaks (const unsigned char *s, size_t n,
               /* No line break for the moment, may be turned into
                  UC_BREAK_POSSIBLE later, via last_p. */
             }
-         
+
           *p = UC_BREAK_PROHIBITED;
 
           w = uc_width (uc, encoding);
@@ -1108,7 +1106,7 @@ u16_width_linebreaks (const unsigned short *s, size_t n,
               /* No line break for the moment, may be turned into
                  UC_BREAK_POSSIBLE later, via last_p. */
             }
-         
+
           *p = UC_BREAK_PROHIBITED;
 
           w = uc_width (uc, encoding);
@@ -1191,7 +1189,7 @@ u32_width_linebreaks (const unsigned int *s, size_t n,
               /* No line break for the moment, may be turned into
                  UC_BREAK_POSSIBLE later, via last_p. */
             }
-         
+
           *p = UC_BREAK_PROHIBITED;
 
           w = uc_width (uc, encoding);
@@ -1619,6 +1617,7 @@ mbs_width_linebreaks (const char *s, size_t n,
                xsum4 (xtimes (n, sizeof (size_t)), m, m,
                       (o != NULL ? m : 0));
              char *memory =
+               (char *)
                (size_in_bounds_p (memory_size) ? malloc (memory_size) : NULL);
               if (memory != NULL)
                 {