From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Mon, 25 Nov 2013 06:32:51 +0000 (+0100)
Subject: 	* grub-core/genmoddep.awk: Use more portable && rather than and.
X-Git-Tag: grub-2.02-beta1~212
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c98dd165b0a0f9621041f2ba940144cd78190a4a;p=thirdparty%2Fgrub.git

	* grub-core/genmoddep.awk: Use more portable && rather than and.
---

diff --git a/ChangeLog b/ChangeLog
index 5dc085447..6b094216a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/genmoddep.awk: Use more portable && rather than and.
+
 2013-11-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/i386/pc/startup.S [__APPLE__]: Create _edata by placing
diff --git a/grub-core/genmoddep.awk b/grub-core/genmoddep.awk
index dc555b93c..2e6af05a7 100644
--- a/grub-core/genmoddep.awk
+++ b/grub-core/genmoddep.awk
@@ -23,7 +23,7 @@ BEGIN {
     } else if ($1 == "undefined") {
       if ($3 in symtab)
 	modtab[$2] = modtab[$2] " " symtab[$3];
-      else if (and ($3 != "__gnu_local_gp", $3 != "_gp_disp")) {
+      else if ($3 != "__gnu_local_gp" && $3 != "_gp_disp") {
 	printf "%s in %s is not defined\n", $3, $2 >"/dev/stderr";
 	error++;
       }