From owner-p4-projects@FreeBSD.ORG  Wed Jul 16 06:11:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 205961065680; Wed, 16 Jul 2008 06:11:50 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CC5DF1065675
	for <perforce@FreeBSD.org>; Wed, 16 Jul 2008 06:11:49 +0000 (UTC)
	(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C0E338FC14
	for <perforce@FreeBSD.org>; Wed, 16 Jul 2008 06:11:49 +0000 (UTC)
	(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6G6Bnov096683
	for <perforce@FreeBSD.org>; Wed, 16 Jul 2008 06:11:49 GMT
	(envelope-from konrad@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6G6BnSp096681
	for perforce@freebsd.org; Wed, 16 Jul 2008 06:11:49 GMT
	(envelope-from konrad@FreeBSD.org)
Date: Wed, 16 Jul 2008 06:11:49 GMT
Message-Id: <200807160611.m6G6BnSp096681@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	konrad@FreeBSD.org using -f
From: Konrad Jankowski <konrad@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 145303 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Jul 2008 06:11:50 -0000

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

Change 145303 by konrad@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;