← Back to branch summary

~jamesodhunt/ubuntu/raring/upstart/1.6

« back to all changes in this revision

Viewing changes to intl/localealias.c

  • Committer: Scott James Remnant
  • Date: 2010-02-04 23:39:59 UTC
  • mfrom: (1182.1.45 upstart)
  • mto: This revision was merged to the branch mainline in revision 1250.
  • Revision ID: scott@netsplit.com-20100204233959-7kajqjnaoh7208ob
Tags: upstream-0.6.5
Import upstream version 0.6.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
intl/localealias.c
1
1
/* Handle aliases for locale names.
2
 
   Copyright (C) 1995-1999, 2000-2001, 2003, 2005 Free Software Foundation, Inc.
 
2
   Copyright (C) 1995-1999, 2000-2001, 2003, 2005-2006 Free Software Foundation, Inc.
3
3
 
4
4
   This program is free software; you can redistribute it and/or modify it
5
5
   under the terms of the GNU Library General Public License as published
349
349
                      string_space_max = new_size;
350
350
                    }
351
351
 
352
 
                  map[nmap].alias = memcpy (&string_space[string_space_act],
353
 
                                            alias, alias_len);
 
352
                  map[nmap].alias =
 
353
                    (const char *) memcpy (&string_space[string_space_act],
 
354
                                           alias, alias_len);
354
355
                  string_space_act += alias_len;
355
356
 
356
 
                  map[nmap].value = memcpy (&string_space[string_space_act],
357
 
                                            value, value_len);
 
357
                  map[nmap].value =
 
358
                    (const char *) memcpy (&string_space[string_space_act],
 
359
                                           value, value_len);
358
360
                  string_space_act += value_len;
359
361
 
360
362
                  ++nmap;