AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-30 utypes.h should not define icu_wcs...() & UFieldPosition

Browse Source 
X-SVN-Rev: 62
This commit is contained in:
Markus Scherer 1999-10-15 18:09:53 +00:00
parent de8aa1d3f9
commit 4be556368b
6 changed files with 131 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/common/Makefile.in
View File

@ -66,7 +66,7 @@ DEPS = $(OBJECTS:.o=.d)
HEADERS = utypes.h uloc.h ures.h ustring.h uchar.h chariter.h \
uchriter.h locid.h resbund.h unicode.h putil.h platform.h unistr.h \
schriter.h normlzr.h ucnv_err.h ucnv.h ucnv_bld.h convert.h \
ubidi.h bidi.h
ubidi.h bidi.h umisc.h
## List of phony targets
.PHONY : all all-local install install-local clean clean-local \

119
icu4c/source/common/common.dsp
View File

@ -267,7 +267,7 @@ SOURCE=.\bidi.h
InputPath=.\bidi.h
"..\..\include\bidi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy bidi.h ..\..\include\
copy bidi.h ..\..\include\
# End Custom Build
@ -277,7 +277,7 @@ InputPath=.\bidi.h
InputPath=.\bidi.h
"..\..\include\bidi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy bidi.h ..\..\include\
copy bidi.h ..\..\include\
# End Custom Build
@ -294,7 +294,7 @@ SOURCE=.\chariter.h
InputPath=.\chariter.h
"..\..\include\chariter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy chariter.h ..\..\include\
copy chariter.h ..\..\include\
# End Custom Build
@ -304,7 +304,7 @@ InputPath=.\chariter.h
InputPath=.\chariter.h
"..\..\include\chariter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy chariter.h ..\..\include\
copy chariter.h ..\..\include\
# End Custom Build
@ -333,7 +333,7 @@ SOURCE=.\convert.h
InputPath=.\convert.h
"..\..\include\convert.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy convert.h ..\..\include\
copy convert.h ..\..\include\
# End Custom Build
@ -343,7 +343,7 @@ InputPath=.\convert.h
InputPath=.\convert.h
"..\..\include\convert.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy convert.h ..\..\include\
copy convert.h ..\..\include\
# End Custom Build
@ -380,7 +380,7 @@ SOURCE=.\locid.h
InputPath=.\locid.h
"..\..\include\locid.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy locid.h ..\..\include\
copy locid.h ..\..\include\
# End Custom Build
@ -390,7 +390,7 @@ InputPath=.\locid.h
InputPath=.\locid.h
"..\..\include\locid.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy locid.h ..\..\include\
copy locid.h ..\..\include\
# End Custom Build
@ -415,7 +415,7 @@ SOURCE=.\normlzr.h
InputPath=.\normlzr.h
"..\..\include\normlzr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy normlzr.h ..\..\include\
copy normlzr.h ..\..\include\
# End Custom Build
@ -425,7 +425,7 @@ InputPath=.\normlzr.h
InputPath=.\normlzr.h
"..\..\include\normlzr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy normlzr.h ..\..\include\
copy normlzr.h ..\..\include\
# End Custom Build
@ -442,7 +442,7 @@ SOURCE=.\putil.h
InputPath=.\putil.h
"..\..\include\putil.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy putil.h ..\..\include\
copy putil.h ..\..\include\
# End Custom Build
@ -452,7 +452,7 @@ InputPath=.\putil.h
InputPath=.\putil.h
"..\..\include\putil.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy putil.h ..\..\include\
copy putil.h ..\..\include\
# End Custom Build
@ -469,7 +469,7 @@ SOURCE=.\pwin32.h
InputPath=.\pwin32.h
"..\..\include\pwin32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy pwin32.h ..\..\include\
copy pwin32.h ..\..\include\
# End Custom Build
@ -479,7 +479,7 @@ InputPath=.\pwin32.h
InputPath=.\pwin32.h
"..\..\include\pwin32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy pwin32.h ..\..\include\
copy pwin32.h ..\..\include\
# End Custom Build
@ -508,7 +508,7 @@ SOURCE=.\resbund.h
InputPath=.\resbund.h
"..\..\include\resbund.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy resbund.h ..\..\include\
copy resbund.h ..\..\include\
# End Custom Build
@ -518,7 +518,7 @@ InputPath=.\resbund.h
InputPath=.\resbund.h
"..\..\include\resbund.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy resbund.h ..\..\include\
copy resbund.h ..\..\include\
# End Custom Build
@ -535,7 +535,7 @@ SOURCE=.\schriter.h
InputPath=.\schriter.h
"..\..\include\schriter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy schriter.h ..\..\include\
copy schriter.h ..\..\include\
# End Custom Build
@ -545,7 +545,7 @@ InputPath=.\schriter.h
InputPath=.\schriter.h
"..\..\include\schriter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy schriter.h ..\..\include\
copy schriter.h ..\..\include\
# End Custom Build
@ -562,7 +562,7 @@ SOURCE=.\scsu.h
InputPath=.\scsu.h
"..\..\include\scsu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy scsu.h ..\..\include\
copy scsu.h ..\..\include\
# End Custom Build
@ -572,7 +572,7 @@ InputPath=.\scsu.h
InputPath=.\scsu.h
"..\..\include\scsu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy scsu.h ..\..\include\
copy scsu.h ..\..\include\
# End Custom Build
@ -589,7 +589,7 @@ SOURCE=.\ubidi.h
InputPath=.\ubidi.h
"..\..\include\ubidi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ubidi.h ..\..\include\
copy ubidi.h ..\..\include\
# End Custom Build
@ -599,7 +599,7 @@ InputPath=.\ubidi.h
InputPath=.\ubidi.h
"..\..\include\ubidi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ubidi.h ..\..\include\
copy ubidi.h ..\..\include\
# End Custom Build
@ -620,7 +620,7 @@ SOURCE=.\uchar.h
InputPath=.\uchar.h
"..\..\include\uchar.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy uchar.h ..\..\include\
copy uchar.h ..\..\include\
# End Custom Build
@ -630,7 +630,7 @@ InputPath=.\uchar.h
InputPath=.\uchar.h
"..\..\include\uchar.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy uchar.h ..\..\include\
copy uchar.h ..\..\include\
# End Custom Build
@ -647,7 +647,7 @@ SOURCE=.\uchriter.h
InputPath=.\uchriter.h
"..\..\include\uchriter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy uchriter.h ..\..\include\
copy uchriter.h ..\..\include\
# End Custom Build
@ -657,7 +657,7 @@ InputPath=.\uchriter.h
InputPath=.\uchriter.h
"..\..\include\uchriter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy uchriter.h ..\..\include\
copy uchriter.h ..\..\include\
# End Custom Build
@ -686,7 +686,7 @@ SOURCE=.\ucnv.h
InputPath=.\ucnv.h
"..\..\include\ucnv.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ucnv.h ..\..\include\
copy ucnv.h ..\..\include\
# End Custom Build
@ -696,7 +696,7 @@ InputPath=.\ucnv.h
InputPath=.\ucnv.h
"..\..\include\ucnv.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ucnv.h ..\..\include\
copy ucnv.h ..\..\include\
# End Custom Build
@ -713,7 +713,7 @@ SOURCE=.\ucnv_bld.h
InputPath=.\ucnv_bld.h
"..\..\include\ucnv_bld.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ucnv_bld.h ..\..\include\
copy ucnv_bld.h ..\..\include\
# End Custom Build
@ -723,7 +723,7 @@ InputPath=.\ucnv_bld.h
InputPath=.\ucnv_bld.h
"..\..\include\ucnv_bld.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ucnv_bld.h ..\..\include\
copy ucnv_bld.h ..\..\include\
# End Custom Build
@ -744,7 +744,7 @@ SOURCE=.\ucnv_err.h
InputPath=.\ucnv_err.h
"..\..\include\ucnv_err.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ucnv_err.h ..\..\include\
copy ucnv_err.h ..\..\include\
# End Custom Build
@ -754,7 +754,7 @@ InputPath=.\ucnv_err.h
InputPath=.\ucnv_err.h
"..\..\include\ucnv_err.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ucnv_err.h ..\..\include\
copy ucnv_err.h ..\..\include\
# End Custom Build
@ -779,7 +779,7 @@ SOURCE=.\uloc.h
InputPath=.\uloc.h
"..\..\include\uloc.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy uloc.h ..\..\include\
copy uloc.h ..\..\include\
# End Custom Build
@ -789,7 +789,7 @@ InputPath=.\uloc.h
InputPath=.\uloc.h
"..\..\include\uloc.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy uloc.h ..\..\include\
copy uloc.h ..\..\include\
# End Custom Build
@ -798,6 +798,37 @@ InputPath=.\uloc.h
# End Source File
# Begin Source File
SOURCE=.\umisc.h
!IF "$(CFG)" == "common - Win32 Release"
# Begin Custom Build
InputPath=.\umisc.h
InputName=umisc
"..\..\include\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputName).h ..\..\include
echo $(InputName)
# End Custom Build
!ELSEIF "$(CFG)" == "common - Win32 Debug"
# Begin Custom Build
InputPath=.\umisc.h
InputName=umisc
"..\..\include\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputName).h ..\..\include
echo $(InputName)
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\umutex.h
# End Source File
# Begin Source File
@ -810,7 +841,7 @@ SOURCE=.\unicode.h
InputPath=.\unicode.h
"..\..\include\unicode.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode.h ..\..\include\
copy unicode.h ..\..\include\
# End Custom Build
@ -820,7 +851,7 @@ InputPath=.\unicode.h
InputPath=.\unicode.h
"..\..\include\unicode.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unicode.h ..\..\include\
copy unicode.h ..\..\include\
# End Custom Build
@ -837,7 +868,7 @@ SOURCE=.\unistr.h
InputPath=.\unistr.h
"..\..\include\unistr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unistr.h ..\..\include\
copy unistr.h ..\..\include\
# End Custom Build
@ -847,7 +878,7 @@ InputPath=.\unistr.h
InputPath=.\unistr.h
"..\..\include\unistr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy unistr.h ..\..\include\
copy unistr.h ..\..\include\
# End Custom Build
@ -868,7 +899,7 @@ SOURCE=.\ures.h
InputPath=.\ures.h
"..\..\include\ures.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ures.h ..\..\include\
copy ures.h ..\..\include\
# End Custom Build
@ -878,7 +909,7 @@ InputPath=.\ures.h
InputPath=.\ures.h
"..\..\include\ures.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ures.h ..\..\include\
copy ures.h ..\..\include\
# End Custom Build
@ -895,7 +926,7 @@ SOURCE=.\ustring.h
InputPath=.\ustring.h
"..\..\include\ustring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ustring.h ..\..\include\
copy ustring.h ..\..\include\
# End Custom Build
@ -905,7 +936,7 @@ InputPath=.\ustring.h
InputPath=.\ustring.h
"..\..\include\ustring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy ustring.h ..\..\include\
copy ustring.h ..\..\include\
# End Custom Build
@ -922,7 +953,7 @@ SOURCE=.\utypes.h
InputPath=.\utypes.h
"..\..\include\utypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy utypes.h ..\..\include\
copy utypes.h ..\..\include\
# End Custom Build
@ -932,7 +963,7 @@ InputPath=.\utypes.h
InputPath=.\utypes.h
"..\..\include\utypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy utypes.h ..\..\include\
copy utypes.h ..\..\include\
# End Custom Build

9
icu4c/source/common/cstring.h
View File

@ -47,6 +47,15 @@
#define icu_toupper(c) toupper(c)
#define icu_tolower(c) tolower(c)
/*===========================================================================*/
/* Wide-character functions */
/*===========================================================================*/
#define icu_wcscat(dst, src) wcscat(dst, src)
#define icu_wcscpy(dst, src) wcscpy(dst, src)
#define icu_wcslen(src) wcslen(src)
#define icu_wcstombs(mbstr, wcstr, count) wcstombs(mbstr, wcstr, count)
#define icu_mbstowcs(wcstr, mbstr, count) mbstowcs(wcstr, mbstr, count)
CAPI char* U_EXPORT2
T_CString_toLowerCase(char* str);

38
icu4c/source/common/umisc.h Normal file
View File

@ -0,0 +1,38 @@
/*
*******************************************************************************
* *
* COPYRIGHT: *
* (C) Copyright International Business Machines Corporation, 1999 *
* Licensed Material - Program-Property of IBM - All Rights Reserved. *
* US Government Users Restricted Rights - Use, duplication, or disclosure *
* restricted by GSA ADP Schedule Contract with IBM Corp. *
* *
*******************************************************************************
* file name: umisc.h
* encoding: US-ASCII
* tab size: 8 (not used)
* indentation:4
*
* created on: 1999oct15
* created by: Markus W. Scherer
*/
#ifndef UMISC_H
#define UMISC_H
#include "utypes.h"
/* This file contains miscellaneous definitions for the C APIs. */
/** A struct representing a range of text containing a specific field */
struct UFieldPosition {
/** The field */
int32_t field;
/** The start of the text range containing field */
int32_t beginIndex;
/** The limit of the text range containing field */
int32_t endIndex;
};
typedef struct UFieldPosition UFieldPosition;
#endif

26
icu4c/source/common/utypes.h
View File

@ -140,6 +140,12 @@ typedef uint16_t UChar;
/* Calendar/TimeZone data types */
/*===========================================================================*/
/**
* Date and Time data type.
* This is a primitive data type that holds the date and time
* as the number of milliseconds since 1970-jan-01, 00:00 UTC.
* UTC leap seconds are ignored.
*/
typedef double UDate;
/* Common time manipulation constants */
@ -149,17 +155,6 @@ typedef double UDate;
#define kMillisPerDay (86400000)
/** A struct representing a range of text containing a specific field */
struct UFieldPosition {
/** The field */
int32_t field;
/** The start of the text range containing field */
int32_t beginIndex;
/** The limit of the text range containing field */
int32_t endIndex;
};
typedef struct UFieldPosition UFieldPosition;
/*===========================================================================*/
/* ClassID-based RTTI */
/*===========================================================================*/
@ -275,15 +270,6 @@ inline bool_t FAILURE(UErrorCode code) { return (bool_t)(code>U_ZERO_ERROR); }
#define T_INT32(i) ((int32_t)i)
/*===========================================================================*/
/* Wide-character functions */
/*===========================================================================*/
#define icu_wcscat(dst, src) wcscat(dst, src)
#define icu_wcscpy(dst, src) wcscpy(dst, src)
#define icu_wcslen(src) wcslen(src)
#define icu_wcstombs(mbstr, wcstr, count) wcstombs(mbstr, wcstr, count)
#define icu_mbstowcs(wcstr, mbstr, count) mbstowcs(wcstr, mbstr, count)
/*===========================================================================*/
/* Debugging */
/*===========================================================================*/

2
icu4c/source/i18n/unum.h
View File

@ -19,6 +19,8 @@
#define _UNUM
#include "utypes.h"
#include "umisc.h"
/**
* Number Format C API Provides functions for
* formatting and parsing a number. Also provides methods for