summaryrefslogtreecommitdiffstats
path: root/gf-error-codes.h.template
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2014-04-28 14:18:50 +0000
committerJeff Darcy <jdarcy@redhat.com>2014-04-28 14:18:50 +0000
commite139b4d0ba2286c0d4d44ba81260c2b287016019 (patch)
tree0a21f0761528e0f79da0a9f67106eb128ace0cf7 /gf-error-codes.h.template
parent73b60c87ca7f62517a8466431f5a8cf167589c8c (diff)
parentf2bac9f9d5b9956969ddd25a54bc636b82f6923e (diff)
Merge branch 'upstream'HEADmaster
Conflicts: rpc/xdr/src/glusterfs3-xdr.c rpc/xdr/src/glusterfs3-xdr.h xlators/features/changelog/src/Makefile.am xlators/features/changelog/src/changelog-helpers.h xlators/features/changelog/src/changelog.c xlators/mgmt/glusterd/src/glusterd-sm.c Change-Id: I9972a5e6184503477eb77a8b56c50a4db4eec3e2
Diffstat (limited to 'gf-error-codes.h.template')
-rw-r--r--gf-error-codes.h.template3
1 files changed, 2 insertions, 1 deletions
diff --git a/gf-error-codes.h.template b/gf-error-codes.h.template
index ab6020d64..5ca64fd90 100644
--- a/gf-error-codes.h.template
+++ b/gf-error-codes.h.template
@@ -9,10 +9,11 @@
#ifndef _GF_ERROR_CODES_H
#define _GF_ERROR_CODES_H
+#ifdef HAVE_LIBINTL_H
#include <libintl.h>
#define _(STRING) gettext(STRING)
-
+#endif
/** START: ERROR CODE DEFINITIONS **/
$DEFINES