← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_locale.h

  • Committer: Monty Taylor
  • Date: 2008-12-18 07:24:54 UTC
  • mto: This revision was merged to the branch mainline in revision 714.
  • Revision ID: monty@bitters-20081218072454-8pnep622damjgqli
Fixed one more my_time thing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_locale.h
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#ifndef DRIZZLED_SQL_LOCALE_H
21
 
#define DRIZZLED_SQL_LOCALE_H
22
 
 
23
 
namespace drizzled
24
 
{
25
 
 
26
 
typedef struct st_typelib TYPELIB;
 
20
#ifndef DRIZZLE_SERVER_LOCALE_H
 
21
#define DRIZZLE_SERVER_LOCALE_H
27
22
 
28
23
typedef struct my_locale_st
29
24
{
30
25
  uint32_t  number;
31
 
  const bool is_ascii;
32
26
  const char *name;
33
27
  const char *description;
 
28
  const bool is_ascii;
34
29
  TYPELIB *month_names;
35
30
  TYPELIB *ab_month_names;
36
31
  TYPELIB *day_names;
37
32
  TYPELIB *ab_day_names;
 
33
#ifdef __cplusplus
38
34
  my_locale_st(uint32_t number_par,
39
35
               const char *name_par, const char *descr_par, bool is_ascii_par,
40
36
               TYPELIB *month_names_par, TYPELIB *ab_month_names_par,
41
37
               TYPELIB *day_names_par, TYPELIB *ab_day_names_par) :
42
 
    number(number_par), is_ascii(is_ascii_par),
43
 
    name(name_par), description(descr_par),
 
38
    number(number_par),
 
39
    name(name_par), description(descr_par), is_ascii(is_ascii_par),
44
40
    month_names(month_names_par), ab_month_names(ab_month_names_par),
45
41
    day_names(day_names_par), ab_day_names(ab_day_names_par)
46
42
  {}
 
43
#endif
47
44
} MY_LOCALE;
48
45
 
49
46
extern MY_LOCALE my_locale_en_US;
53
50
MY_LOCALE *my_locale_by_name(const char *name);
54
51
MY_LOCALE *my_locale_by_number(uint32_t number);
55
52
 
56
 
} /* namespace drizzled */
57
 
 
58
 
#endif /* DRIZZLED_SQL_LOCALE_H */
 
53
#endif /* DRIZZLE_SERVER_LOCALE_H */