--- embedaddon/sudo/common/gidlist.c	2013/10/14 07:56:33	1.1.1.1
+++ embedaddon/sudo/common/gidlist.c	2014/06/15 16:12:54	1.1.1.2
@@ -30,15 +30,14 @@
 #include <grp.h>
 
 #define DEFAULT_TEXT_DOMAIN	"sudo"
-#include "gettext.h"
+#include "gettext.h"		/* must be included before missing.h */
 
 #include "missing.h"
 #include "alloc.h"
 #include "fatal.h"
 #include "sudo_debug.h"
+#include "sudo_util.h"
 
-extern id_t atoid(const char *p, const char *sep, char **endp, const char **errstr);
-
 /*
  * Parse a comma-separated list of gids into an allocated array of GETGROUPS_T.
  * If a pointer to the base gid is specified, it is stored as the first element
@@ -77,7 +76,7 @@ parse_gid_list(const char *gidstr, const gid_t *basegi
 	do {
 	    gids[ngids] = (GETGROUPS_T) atoid(cp, ",", &ep, &errstr);
 	    if (errstr != NULL) {
-		warningx(_("%s: %s"), cp, _(errstr));
+		warningx(U_("%s: %s"), cp, U_(errstr));
 		free(gids);
 		debug_return_int(-1);
 	    }