aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcvpcs <root@cvpcs.org>2010-06-03 11:33:40 -0500
committercvpcs <root@cvpcs.org>2010-06-03 11:33:40 -0500
commitae603269d2fbb6784019d92dbe4396272bc4c12d (patch)
tree60fb08d1f706cb524143eb42cc854d600587079d
parent512fd1ee9ee3376658648d37f1fac923201d2fa8 (diff)
downloadexternal_bash-ae603269d2fbb6784019d92dbe4396272bc4c12d.zip
external_bash-ae603269d2fbb6784019d92dbe4396272bc4c12d.tar.gz
external_bash-ae603269d2fbb6784019d92dbe4396272bc4c12d.tar.bz2
switched to use of __BIONIC__ define instead of commenting lines out
-rw-r--r--bashline.c6
-rw-r--r--lib/readline/complete.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/bashline.c b/bashline.c
index 174ea80..53ae281 100644
--- a/bashline.c
+++ b/bashline.c
@@ -2102,9 +2102,9 @@ bash_groupname_completion_function (text, state)
const char *text;
int state;
{
-//#if defined (__WIN32__) || defined (__OPENNT) || !defined (HAVE_GRP_H)
+#if defined (__BIONIC__) || defined (__WIN32__) || defined (__OPENNT) || !defined (HAVE_GRP_H)
return ((char *)NULL);
-/*#else
+#else
static char *gname = (char *)NULL;
static struct group *grent;
static int gnamelen;
@@ -2133,7 +2133,7 @@ bash_groupname_completion_function (text, state)
value = savestring (grent->gr_name);
return (value);
-#endif*/
+#endif
}
/* Functions to perform history and alias expansions on the current line. */
diff --git a/lib/readline/complete.c b/lib/readline/complete.c
index 38249d2..2c7e696 100644
--- a/lib/readline/complete.c
+++ b/lib/readline/complete.c
@@ -1953,7 +1953,7 @@ rl_username_completion_function (text, state)
const char *text;
int state;
{
-#if defined (__WIN32__) || defined (__OPENNT)
+#if defined (__BIONIC__) || (__WIN32__) || defined (__OPENNT)
return (char *)NULL;
#else /* !__WIN32__ && !__OPENNT) */
static char *username = (char *)NULL;
@@ -1970,7 +1970,7 @@ rl_username_completion_function (text, state)
username = savestring (&text[first_char_loc]);
namelen = strlen (username);
-// setpwent ();
+ setpwent ();
}
#if defined (HAVE_GETPWENT)