From 688c4de0a35ea5b0743faa7f8f6435fe82498332 Mon Sep 17 00:00:00 2001
From: Ilya Verbin <ilya.verbin@intel.com>
Date: Tue, 24 Nov 2015 21:04:47 +0000
Subject: [PATCH] c-parser.c (c_parser_oacc_declare): Replace "ifdef
 ENABLE_OFFLOADING" with "if (ENABLE_OFFLOADING)".

gcc/c/
	* c-parser.c (c_parser_oacc_declare): Replace "ifdef ENABLE_OFFLOADING"
	with "if (ENABLE_OFFLOADING)".
gcc/cp/
	* parser.c (cp_parser_oacc_declare): replace "ifdef enable_offloading"
	with "if (enable_offloading)".

From-SVN: r230842
---
 gcc/c/ChangeLog  |  5 +++++
 gcc/c/c-parser.c | 13 +++++++------
 gcc/cp/ChangeLog |  5 +++++
 gcc/cp/parser.c  | 13 +++++++------
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 1e9314d1970..805cc4f16a5 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-24  Ilya Verbin  <ilya.verbin@intel.com>
+
+	* c-parser.c (c_parser_oacc_declare): Replace "ifdef ENABLE_OFFLOADING"
+	with "if (ENABLE_OFFLOADING)".
+
 2015-11-23  David Malcolm  <dmalcolm@redhat.com>
 
 	PR objc/68438
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 18e995740c3..44a925ba32c 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -13484,14 +13484,15 @@ c_parser_oacc_declare (c_parser *parser)
 	      if (node != NULL)
 		{
 		  node->offloadable = 1;
-#ifdef ENABLE_OFFLOADING
-		  g->have_offload = true;
-		  if (is_a <varpool_node *> (node))
+		  if (ENABLE_OFFLOADING)
 		    {
-		      vec_safe_push (offload_vars, decl);
-		      node->force_output = 1;
+		      g->have_offload = true;
+		      if (is_a <varpool_node *> (node))
+			{
+			  vec_safe_push (offload_vars, decl);
+			  node->force_output = 1;
+			}
 		    }
-#endif
 		}
 	    }
 	}
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f401b822bbb..a4aa01e3b2a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-24  Ilya Verbin  <ilya.verbin@intel.com>
+
+	* parser.c (cp_parser_oacc_declare): Replace "ifdef ENABLE_OFFLOADING"
+	with "if (ENABLE_OFFLOADING)".
+
 2015-11-23  Igor Zamyatin  <igor.zamyatin@intel.com>
 
 	PR c++/68001
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 24ed404adaf..a9c0a452d6b 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -34633,14 +34633,15 @@ cp_parser_oacc_declare (cp_parser *parser, cp_token *pragma_tok)
 	      if (node != NULL)
 		{
 		  node->offloadable = 1;
-#ifdef ENABLE_OFFLOADING
-		  g->have_offload = true;
-		  if (is_a <varpool_node *> (node))
+		  if (ENABLE_OFFLOADING)
 		    {
-		      vec_safe_push (offload_vars, decl);
-		      node->force_output = 1;
+		      g->have_offload = true;
+		      if (is_a <varpool_node *> (node))
+			{
+			  vec_safe_push (offload_vars, decl);
+			  node->force_output = 1;
+			}
 		    }
-#endif
 		}
 	    }
 	}
-- 
2.30.2