PERFORCE change 145303 for review

[Konrad Jankowski]

http://perforce.freebsd.org/chv.cgi?CH=145303

Change 145303 by konrad at vspredator on 2008/07/16 06:11:13

	Another compatibility fix to remain comliant with current colldef file format.

Affected files ...

.. //depot/projects/soc2008/konrad_collation/colldef.apple/collate.h#4 edit
.. //depot/projects/soc2008/konrad_collation/colldef.apple/scan.l#4 edit

Differences ...

==== //depot/projects/soc2008/konrad_collation/colldef.apple/collate.h#4 (text+ko) ====

@@ -44,6 +44,7 @@
 #define COLLATE_VERSION    "1.0\n"
 #define COLLATE_VERSION1_1 "1.1\n"
 #define COLLATE_VERSION1_1A "1.1A\n"
+#define COLLATE_VERSION1_2 "1.2\n"
 /* see discussion in string/FreeBSD/strxfrm for this value */
 #define COLLATE_MAX_PRIORITY ((1 << 24) - 1)
 

==== //depot/projects/soc2008/konrad_collation/colldef.apple/scan.l#4 (text+ko) ====

@@ -59,7 +59,8 @@
 %}
 %%
 <INITIAL,charmap,nchar,subs,subs2,ldef>[ \t]+      ;
-<subs2,ldef>\"          return EXPAND;
+<subs2>\"		{ ptr = buf; BEGIN(string); }
+<ldef>\"		return EXPAND;
 <string>\<             {
 	if(localedefmode) {
 		ptrsave = ptr;