From 7c245e16546123982c63ec810911458d6ed4a664 Mon Sep 17 00:00:00 2001
From: Raphael Quinet <raphael@gimp.org>
Date: Fri, 4 Aug 2006 22:12:44 +0000
Subject: [PATCH] Do not declare a symbol "link" because this conflicts with
 the system call

2006-08-05  Raphael Quinet  <raphael@gimp.org>

	* plug-ins/imagemap/imap_ncsa.l: Do not declare a symbol "link"
	because this conflicts with the system call declared in
	<unistd.h>.  Renamed that symbol "imap_link".  Fixes bug #349589.

	* plug-ins/imagemap/imap_ncsa_lex.c: Updated by hand in order to
	avoid large changes introduced by more recent versions of flex.
---
 ChangeLog                         |  9 +++++++++
 plug-ins/imagemap/imap_ncsa.l     | 12 ++++++------
 plug-ins/imagemap/imap_ncsa_lex.c | 12 ++++++------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b28549fd07..f2cc8169a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-05  Raphaël Quinet  <raphael@gimp.org>
+
+	* plug-ins/imagemap/imap_ncsa.l: Do not declare a symbol "link"
+	because this conflicts with the system call declared in
+	<unistd.h>.  Renamed that symbol "imap_link".  Fixes bug #349589.
+
+	* plug-ins/imagemap/imap_ncsa_lex.c: Updated by hand in order to
+	avoid large changes introduced by more recent versions of flex.
+
 2006-08-04  Raphaël Quinet  <raphael@gimp.org>
 
 	* tools/pdbgen/stddefs.pdb
diff --git a/plug-ins/imagemap/imap_ncsa.l b/plug-ins/imagemap/imap_ncsa.l
index d22c9b2655..847badcd29 100755
--- a/plug-ins/imagemap/imap_ncsa.l
+++ b/plug-ins/imagemap/imap_ncsa.l
@@ -38,7 +38,7 @@ DIGIT	[0-9]
 ID	[a-zA-Z_][a-zA-Z0-9_\-]*
 WS	[ \t\n]+
 
-%x link
+%x imap_link
 %x comment
 
 %%
@@ -70,26 +70,26 @@ WS	[ \t\n]+
 				}
 
 RECT				{
-				   BEGIN(link);
+				   BEGIN(imap_link);
    				   return RECTANGLE;
 				}
 
 CIRCLE				{
-				   BEGIN(link);
+				   BEGIN(imap_link);
 				   return CIRCLE;
 				}
 
 POLY				{
-				   BEGIN(link);
+				   BEGIN(imap_link);
 				   return POLYGON;
 				}
 
 DEFAULT				{
-				   BEGIN(link);
+				   BEGIN(imap_link);
 				   return DEFAULT;
 				}
 
-<link>[^ ,\t\n]+		{
+<imap_link>[^ ,\t\n]+		{
    				   BEGIN(INITIAL);
    				   strcpy(ncsa_lval.id, yytext);
 				   ncsa_lval.id[yyleng - 1] = '\0';
diff --git a/plug-ins/imagemap/imap_ncsa_lex.c b/plug-ins/imagemap/imap_ncsa_lex.c
index 41951875a0..7f4232ec8d 100644
--- a/plug-ins/imagemap/imap_ncsa_lex.c
+++ b/plug-ins/imagemap/imap_ncsa_lex.c
@@ -460,7 +460,7 @@ char *yytext;
 #include <string.h>
 
 #include "imap_ncsa_parse.h"
-#define link 1
+#define imap_link 1
 
 #define comment 2
 
@@ -746,7 +746,7 @@ case 6:
 YY_RULE_SETUP
 #line 65 "imap_ncsa.l"
 {
-				   BEGIN(link);
+				   BEGIN(imap_link);
    				   return RECTANGLE;
 				}
 	YY_BREAK
@@ -754,7 +754,7 @@ case 7:
 YY_RULE_SETUP
 #line 70 "imap_ncsa.l"
 {
-				   BEGIN(link);
+				   BEGIN(imap_link);
 				   return CIRCLE;
 				}
 	YY_BREAK
@@ -762,7 +762,7 @@ case 8:
 YY_RULE_SETUP
 #line 75 "imap_ncsa.l"
 {
-				   BEGIN(link);
+				   BEGIN(imap_link);
 				   return POLYGON;
 				}
 	YY_BREAK
@@ -770,7 +770,7 @@ case 9:
 YY_RULE_SETUP
 #line 80 "imap_ncsa.l"
 {
-				   BEGIN(link);
+				   BEGIN(imap_link);
 				   return DEFAULT;
 				}
 	YY_BREAK
@@ -809,7 +809,7 @@ ECHO;
 	YY_BREAK
 #line 809 "imap_ncsa_lex.c"
 case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(link):
+case YY_STATE_EOF(imap_link):
 case YY_STATE_EOF(comment):
 	yyterminate();