← 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-14 16:24:25 UTC
  • Revision ID: brian@tangent.org-20080714162425-juw3vw221gs9kysh
Cleanup around intptr_t

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/m_string.h
333
333
 
334
334
  if (len > 20)
335
335
  {
336
 
    const uchar *end_words= (const uchar *)(intptr)
337
 
      (((uint64_t)(intptr)end) / SIZEOF_INT * SIZEOF_INT);
338
 
    const uchar *start_words= (const uchar *)(intptr)
339
 
       ((((uint64_t)(intptr)ptr) + SIZEOF_INT - 1) / SIZEOF_INT * SIZEOF_INT);
 
336
    const uchar *end_words= (const uchar *)(intptr_t)
 
337
      (((uint64_t)(intptr_t)end) / SIZEOF_INT * SIZEOF_INT);
 
338
    const uchar *start_words= (const uchar *)(intptr_t)
 
339
       ((((uint64_t)(intptr_t)ptr) + SIZEOF_INT - 1) / SIZEOF_INT * SIZEOF_INT);
340
340
 
341
 
    DBUG_ASSERT(((uint64_t)(intptr)ptr) >= SIZEOF_INT);
 
341
    DBUG_ASSERT(((uint64_t)(intptr_t)ptr) >= SIZEOF_INT);
342
342
    if (end_words > ptr)
343
343
    {
344
344
      while (end > end_words && end[-1] == 0x20)