← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to include/m_string.h

  • Committer: Brian Aker
  • Date: 2008-07-13 22:21:51 UTC
  • Revision ID: brian@tangent.org-20080713222151-fv2tcpbsc829j2oc
Ulonglong to uint64_t

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/m_string.h
257
257
extern char *longlong10_to_str(longlong val,char *dst,int radix);
258
258
#if (!defined(HAVE_STRTOULL) || defined(NO_STRTOLL_PROTO))
259
259
extern longlong strtoll(const char *str, char **ptr, int base);
260
 
extern ulonglong strtoull(const char *str, char **ptr, int base);
 
260
extern uint64_t strtoull(const char *str, char **ptr, int base);
261
261
#endif
262
262
#endif
263
263
 
334
334
  if (len > 20)
335
335
  {
336
336
    const uchar *end_words= (const uchar *)(intptr)
337
 
      (((ulonglong)(intptr)end) / SIZEOF_INT * SIZEOF_INT);
 
337
      (((uint64_t)(intptr)end) / SIZEOF_INT * SIZEOF_INT);
338
338
    const uchar *start_words= (const uchar *)(intptr)
339
 
       ((((ulonglong)(intptr)ptr) + SIZEOF_INT - 1) / SIZEOF_INT * SIZEOF_INT);
 
339
       ((((uint64_t)(intptr)ptr) + SIZEOF_INT - 1) / SIZEOF_INT * SIZEOF_INT);
340
340
 
341
 
    DBUG_ASSERT(((ulonglong)(intptr)ptr) >= SIZEOF_INT);
 
341
    DBUG_ASSERT(((uint64_t)(intptr)ptr) >= SIZEOF_INT);
342
342
    if (end_words > ptr)
343
343
    {
344
344
      while (end > end_words && end[-1] == 0x20)