organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-4220 rename util.h to rbutil.h because it conflicts with common/util.h

Browse source 
X-SVN-Rev: 17289
This commit is contained in:
George Rhoten 2005-03-08 07:05:49 +00:00
parent 26f029b88d
commit e07f0299f0
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/tools/genrb/Makefile.in
View file

@ -32,7 +32,7 @@ DERB = $(BINDIR)/$(DERB_STUB_NAME)$(EXEEXT)
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
LIBS = $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = errmsg.o genrb.o parse.o read.o reslist.o ustr.o util.o \
OBJECTS = errmsg.o genrb.o parse.o read.o reslist.o ustr.o rbutil.o \
wrtjava.o rle.o wrtxml.o prscmnts.o
DERB_OBJ = derb.o

2
icu4c/source/tools/genrb/genrb.h
View file

@ -26,7 +26,7 @@
#include "ucbuf.h"
#include "errmsg.h"
#include "parse.h"
#include "util.h"
#include "rbutil.h"
#include "reslist.h"

12
icu4c/source/tools/genrb/genrb.vcproj
View file

@ -152,6 +152,9 @@
<File
RelativePath=".\prscmnts.cpp">
</File>
<File
RelativePath=".\rbutil.c">
</File>
<File
RelativePath=".\read.c">
</File>
@ -164,9 +167,6 @@
<File
RelativePath=".\ustr.c">
</File>
<File
RelativePath=".\util.c">
</File>
<File
RelativePath=".\wrtjava.c">
</File>
@ -189,6 +189,9 @@
<File
RelativePath=".\prscmnts.h">
</File>
<File
RelativePath=".\rbutil.h">
</File>
<File
RelativePath=".\read.h">
</File>
@ -201,9 +204,6 @@
<File
RelativePath=".\ustr.h">
</File>
<File
RelativePath=".\util.h">
</File>
</Filter>
<Filter
Name="Resource Files"

2
icu4c/source/tools/genrb/util.c → icu4c/source/tools/genrb/rbutil.c
View file

@ -16,7 +16,7 @@
*/
#include "unicode/putil.h"
#include "util.h"
#include "rbutil.h"
#include "cmemory.h"
#include "cstring.h"

4
icu4c/source/tools/genrb/util.h → icu4c/source/tools/genrb/rbutil.h
View file

@ -1,12 +1,12 @@
/*
*******************************************************************************
*
* Copyright (C) 1998-1999, International Business Machines
* Copyright (C) 1998-2005, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
*
* File util.h
* File rbutil.h
*
* Modification History:
*