← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/errmsg_print.cc

  • Committer: Brian Aker
  • Date: 2011-02-20 20:47:53 UTC
  • mto: This revision was merged to the branch mainline in revision 2187.
  • Revision ID: brian@tangent.org-20110220204753-7bo4wno7q9vsqc97
Merge in additional header bits for strerror_r

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/errmsg_print.cc
40
40
  char errmsg[STRERROR_MAX];
41
41
  errmsg[0]= 0;
42
42
 
43
 
#ifdef _GNU_SOURCE
44
 
      errmsg_ptr= strerror_r(errno, errmsg, sizeof(errmsg));
 
43
#ifdef STRERROR_R_CHAR_P
 
44
  errmsg_ptr= strerror_r(errno, errmsg, sizeof(errmsg));
45
45
#else
46
 
      strerror_r(errno, errmsg, sizeof(errmsg));
47
 
      errmsg_ptr= errmsg;
 
46
  strerror_r(errno, errmsg, sizeof(errmsg));
 
47
  errmsg_ptr= errmsg;
48
48
#endif
49
49
 
50
50
  errmsg_printf(error::ERROR, "%s: %s\n", message, errmsg);
65
65
  char errmsg[STRERROR_MAX];
66
66
  errmsg[0]= 0;
67
67
 
68
 
#ifdef _GNU_SOURCE
69
 
      errmsg_ptr= strerror_r(errno, errmsg, sizeof(errmsg));
 
68
#ifdef STRERROR_R_CHAR_P
 
69
  errmsg_ptr= strerror_r(errno, errmsg, sizeof(errmsg));
70
70
#else
71
 
      strerror_r(errno, errmsg, sizeof(errmsg));
72
 
      errmsg_ptr= errmsg;
 
71
  strerror_r(errno, errmsg, sizeof(errmsg));
 
72
  errmsg_ptr= errmsg;
73
73
#endif
74
74
 
75
75
  if (not extra.empty())