← Back to branch summary

~jaypipes/drizzle/split-xa-resource-manager

« back to all changes in this revision

Viewing changes to drizzled/internal/my_sys.h

  • Committer: Jay Pipes
  • Date: 2010-02-14 20:26:43 UTC
  • mfrom: (1273.1.27 staging)
  • Revision ID: jpipes@serialcoder-20100214202643-ahuqvc8rhn8u7y33
Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/my_sys.h
37
37
#include "drizzled/internal/aio_result.h"
38
38
 
39
39
#include "drizzled/memory/root.h"
40
 
#include "drizzled/my_error.h"
 
40
#include "drizzled/error.h"
41
41
 
42
42
#ifndef errno                           /* did we already get it? */
43
43
#ifdef HAVE_ERRNO_AS_DEFINE