From c76a60b0a55f943eb902b6c8308713b919cdfd67 Mon Sep 17 00:00:00 2001
From: Boris Faure <billiob@gmail.com>
Date: Fri, 12 Aug 2011 12:39:17 +0000
Subject: [PATCH] edje/epp: cpp line control command is #line

SVN revision: 62381
---
 legacy/edje/src/bin/edje_cc_parse.c | 2 +-
 legacy/edje/src/bin/epp/cpplib.c    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/legacy/edje/src/bin/edje_cc_parse.c b/legacy/edje/src/bin/edje_cc_parse.c
index 3a127447c0..873e92d0af 100644
--- a/legacy/edje/src/bin/edje_cc_parse.c
+++ b/legacy/edje/src/bin/edje_cc_parse.c
@@ -273,7 +273,7 @@ next_token(char *p, char *end, char **new_p, int *delim)
 
 	     /* handle cpp comments */
 	     /* their line format is
-	      * # <line no. of next line> <filename from next line on> [??]
+	      * #line <line no. of next line> <filename from next line on> [??]
 	      */
 	     cpp_token_line = NULL;
 	     cpp_token_file = NULL;
diff --git a/legacy/edje/src/bin/epp/cpplib.c b/legacy/edje/src/bin/epp/cpplib.c
index d6c60d2546..132d2a9ca8 100644
--- a/legacy/edje/src/bin/epp/cpplib.c
+++ b/legacy/edje/src/bin/epp/cpplib.c
@@ -2147,13 +2147,8 @@ output_line_command(cpp_reader * pfile, int conditional,
 
    CPP_RESERVE(pfile, 4 * strlen(ip->nominal_fname) + 50);
    {
-#ifdef OUTPUT_LINE_COMMANDS
       static char         sharp_line[] = "#line ";
 
-#else
-      static char         sharp_line[] = "# ";
-
-#endif
       CPP_PUTS_Q(pfile, sharp_line, sizeof(sharp_line) - 1);
    }