diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/edje/src/bin/epp | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to '')
-rw-r--r-- | libraries/edje/src/bin/epp/Makefile.in | 2 | ||||
-rw-r--r-- | libraries/edje/src/bin/epp/cppmain.c | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/libraries/edje/src/bin/epp/Makefile.in b/libraries/edje/src/bin/epp/Makefile.in index 2ef2e56..c1a8ee5 100644 --- a/libraries/edje/src/bin/epp/Makefile.in +++ b/libraries/edje/src/bin/epp/Makefile.in | |||
@@ -225,8 +225,6 @@ PACKAGE_URL = @PACKAGE_URL@ | |||
225 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 225 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
226 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 226 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
227 | PKG_CONFIG = @PKG_CONFIG@ | 227 | PKG_CONFIG = @PKG_CONFIG@ |
228 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
229 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
230 | PYTHON = @PYTHON@ | 228 | PYTHON = @PYTHON@ |
231 | PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ | 229 | PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ |
232 | PYTHON_PLATFORM = @PYTHON_PLATFORM@ | 230 | PYTHON_PLATFORM = @PYTHON_PLATFORM@ |
diff --git a/libraries/edje/src/bin/epp/cppmain.c b/libraries/edje/src/bin/epp/cppmain.c index 45b67b5..ea0a0b2 100644 --- a/libraries/edje/src/bin/epp/cppmain.c +++ b/libraries/edje/src/bin/epp/cppmain.c | |||
@@ -44,7 +44,9 @@ main(int argc, char **argv) | |||
44 | int argi = 1; /* Next argument to handle. */ | 44 | int argi = 1; /* Next argument to handle. */ |
45 | struct cpp_options *opts = &options; | 45 | struct cpp_options *opts = &options; |
46 | enum cpp_token kind; | 46 | enum cpp_token kind; |
47 | int got_text; | 47 | #if EPP_DEBUG |
48 | int got_text = 0; | ||
49 | #endif | ||
48 | 50 | ||
49 | p = argv[0] + strlen(argv[0]); | 51 | p = argv[0] + strlen(argv[0]); |
50 | #ifndef __EMX__ | 52 | #ifndef __EMX__ |
@@ -76,7 +78,6 @@ main(int argc, char **argv) | |||
76 | else if (!freopen(opts->out_fname, "w", stdout)) | 78 | else if (!freopen(opts->out_fname, "w", stdout)) |
77 | cpp_pfatal_with_name(&parse_in, opts->out_fname); | 79 | cpp_pfatal_with_name(&parse_in, opts->out_fname); |
78 | 80 | ||
79 | got_text = 0; | ||
80 | for (i = 0;; i++) | 81 | for (i = 0;; i++) |
81 | { | 82 | { |
82 | kind = cpp_get_token(&parse_in); | 83 | kind = cpp_get_token(&parse_in); |
@@ -108,7 +109,9 @@ main(int argc, char **argv) | |||
108 | case CPP_COMMA: | 109 | case CPP_COMMA: |
109 | case CPP_SEMICOLON: | 110 | case CPP_SEMICOLON: |
110 | case CPP_3DOTS: | 111 | case CPP_3DOTS: |
111 | got_text = 1; | 112 | #if EPP_DEBUG |
113 | got_text = 1; | ||
114 | #endif | ||
112 | continue; | 115 | continue; |
113 | 116 | ||
114 | case CPP_COMMENT: | 117 | case CPP_COMMENT: |
@@ -130,7 +133,9 @@ main(int argc, char **argv) | |||
130 | exit(FATAL_EXIT_CODE); | 133 | exit(FATAL_EXIT_CODE); |
131 | } | 134 | } |
132 | parse_in.limit = parse_in.token_buffer; | 135 | parse_in.limit = parse_in.token_buffer; |
133 | got_text = 0; | 136 | #if EPP_DEBUG |
137 | got_text = 0; | ||
138 | #endif | ||
134 | } | 139 | } |
135 | 140 | ||
136 | done: | 141 | done: |