diff options
| author | Hans Petter Jansson <hpj@ximian.com> | 2003-09-22 15:32:34 +0800 |
|---|---|---|
| committer | Hans Petter <hansp@src.gnome.org> | 2003-09-22 15:32:34 +0800 |
| commit | c5a06d54f661243c0775dd3d40e173e661616c1b (patch) | |
| tree | c5dae46f26c445eed43e883386643303039b893c /libical/src/libicalss/icalsslexer.l | |
| parent | 88d4fd5eac6bf7bcfd845f548efabc9801199cd2 (diff) | |
| download | gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.gz gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.bz2 gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.lz gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.xz gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.zst gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.zip | |
libical.la -> libical-evolution.la
2003-09-22 Hans Petter Jansson <hpj@ximian.com>
* calendar/cal-util/Makefile.am (libical_util_la_LIBADD):
libical.la -> libical-evolution.la
* calendar/importers/Makefile.am
(libevolution_calendar_importers_la_LIBADD):
libicalvcal.la -> libicalvcal-evolution.la
* shell/Makefile.am (evolution_LDADD):
libical.la -> libical-evolution.la
* libical/configure.in: Require flex 2.5.31 and add a test for it.
Rename WITH_CXX conditional to WITH_CXX_BINDINGS.
* libical/examples/Makefile.am (doesnothing_LDADD): Add -evolution to
lib names.
* libical/src/test/Makefile.am: WITH_CXX -> WITH_CXX_BINDINGS. Add
-evolution to lib names.
* libical/src/test/regression.c (main): WITH_CXX -> WITH_CXX_BINDINGS.
* libical/src/libicalcap/Makefile.am: Add -evolution to lib names.
Install to Evolution's priv dirs.
* libical/src/libicalvcal/Makefile.am: Ditto.
* libical/src/libical/Makefile.am: WITH_CXX -> WITH_CXX_BINDINGS. Add
-evolution to lib names. Install in privlibdir. Install includes to
$(privincludedir)/libical.
* libical/src/libicalss/Makefile.am: Ditto.
* libical/src/libicalss/icalsslexer.l: Replace option reentrant-bison
with reentrant and bison-bridge. Use new Flex variable names.
* libical/src/libical/icallexer.l:
* libical/src/libical/icalyacc.y:
* libical/src/libicalss/icalsslexer.c:
* libical/src/libicalss/icalssyacc.c:
* libical/src/libicalss/icalssyacc.h: Removed from repository.
svn path=/trunk/; revision=22633
Diffstat (limited to 'libical/src/libicalss/icalsslexer.l')
| -rw-r--r-- | libical/src/libicalss/icalsslexer.l | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libical/src/libicalss/icalsslexer.l b/libical/src/libicalss/icalsslexer.l index 6ea9f0ef2a..be1dc553cd 100644 --- a/libical/src/libicalss/icalsslexer.l +++ b/libical/src/libicalss/icalsslexer.l @@ -6,7 +6,7 @@ DESCRIPTION: - $Id: icalsslexer.l,v 1.2 2003/09/11 22:04:30 hansp Exp $ + $Id: icalsslexer.l,v 1.3 2003/09/22 07:32:31 hansp Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -57,7 +57,8 @@ digit [0-9] %array /* Make yytext an array. Slow, but handy. HACK */ %option caseless -%option reentrant-bison +%option reentrant bison-bridge +%option yylineno %s sql string_value @@ -90,10 +91,10 @@ NULL { return SQLNULL; } ; { return EOL; } \'[\@\*A-Za-z0-9\-\.\:\ ]+\' { - int c = input(yy_globals); + int c = input(yyscanner); unput(c); if(c!='\''){ - yylvalp->v_string= icalmemory_tmp_copy(yytext); + yylval_param->v_string= icalmemory_tmp_copy(yytext); return STRING; } else { /*ssmore();*/ @@ -110,7 +111,7 @@ NULL { return SQLNULL; } %% -int yywrap(yyscan_t yy_globals) +int yywrap(yyscan_t yyscanner) { return 1; } |