← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/charset_info.h

  • Committer: lbieber
  • Date: 2010-10-07 02:59:11 UTC
  • mfrom: (1818.1.2 build)
  • Revision ID: lbieber@orisndriz08-20101007025911-rz1n8q23hrwxks6v
Merge Brian - Fix a large number of warning issues on ICC. sql_string becomes 64bit
Merge Monty - clean up ICC warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/charset_info.h
238
238
  /* Charset dependant snprintf() */
239
239
  size_t (*snprintf)(const struct charset_info_st * const, char *to, size_t n,
240
240
                     const char *fmt,
241
 
                     ...) __attribute__((format(printf, 4, 5)));
 
241
                     ...)
 
242
#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
 
243
                         __attribute__((format(printf, 4, 5)))
 
244
#endif
 
245
                         ;
242
246
  size_t (*long10_to_str)(const struct charset_info_st * const, char *to, size_t n,
243
247
                          int radix, long int val);
244
248
  size_t (*int64_t10_to_str)(const struct charset_info_st * const, char *to, size_t n,