← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/unireg.h

  • Committer: Monty Taylor
  • Date: 2008-08-04 19:45:27 UTC
  • mto: (261.2.2 codestyle)
  • mto: This revision was merged to the branch mainline in revision 262.
  • Revision ID: monty@inaugust.com-20080804194527-gmcepj2kyqxwh51s
Made the ER() macro always gettext the return value.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/unireg.h
18
18
 
19
19
#ifndef _unireg_h
20
20
 
 
21
#include <libdrizzle/gettext.h>
 
22
 
21
23
#ifndef NO_ALARM_LOOP
22
24
#define NO_ALARM_LOOP           /* lib5 and popen can't use alarm */
23
25
#endif
39
41
#define PLUGINDIR       "lib/plugin"
40
42
#endif
41
43
 
42
 
#define ER(X) drizzled_error_messages[(X) - ER_ERROR_FIRST]
43
 
#define ER_SAFE(X) (((X) >= ER_ERROR_FIRST && (X) <= ER_ERROR_LAST) ? ER(X) : "Invalid error code")
 
44
#define ER(X) _(drizzled_error_messages[(X) - ER_ERROR_FIRST])
 
45
#define ER_SAFE(X) (((X) >= ER_ERROR_FIRST && (X) <= ER_ERROR_LAST) ? ER(X) : _("Invalid error code"))
44
46
 
45
47
 
46
48
#define ERRMAPP 1                               /* Errormap f|r my_error */