ICU-408 fixes for HPUX
X-SVN-Rev: 1528
This commit is contained in:
parent
9754bb9d1a
commit
9ff4e2eaa0
@ -14,8 +14,8 @@ GEN_DEPS.c= :
|
||||
GEN_DEPS.cc= :
|
||||
|
||||
## Commands to compile
|
||||
COMPILE.c= $(CC) +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) -c
|
||||
COMPILE.cc= $(CXX) +z +a1 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c
|
||||
COMPILE.c= $(CC) -D__STDC__ +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) -c
|
||||
COMPILE.cc= $(CXX) +dup_static_removal +d -D__STDC__ +z +a1 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c
|
||||
|
||||
## Commands to link
|
||||
## We need to use the C++ linker, even when linking C programs, since
|
||||
|
@ -254,8 +254,10 @@ class U_I18N_API UnicodeSet : public UnicodeFilter {
|
||||
UChar32* list; // MUST be terminated with HIGH
|
||||
UChar32* buffer; // internal buffer, may be NULL
|
||||
|
||||
static const UChar32 LOW; // LOW <= all valid values. ZERO for codepoints
|
||||
#ifndef HPUX
|
||||
static const UChar32 HIGH; // HIGH > all valid values. 110000 for codepoints
|
||||
#endif
|
||||
static const UChar32 LOW; // LOW <= all valid values. ZERO for codepoints
|
||||
|
||||
static const int32_t START_EXTRA; // initial storage. Must be >= 0
|
||||
static const int32_t GROW_EXTRA; // extra amount for growth. Must be >= 0
|
||||
|
@ -13,8 +13,13 @@
|
||||
#include "symtable.h"
|
||||
#include "cmemory.h"
|
||||
|
||||
#ifndef HPUX
|
||||
const UChar32 UnicodeSet::HIGH= 0x0110000; // HIGH_VALUE > all valid values. 110000 for codepoints
|
||||
#else
|
||||
# define HIGH (0x0110000)
|
||||
#endif
|
||||
const UChar32 UnicodeSet::LOW = 0x000000; // LOW <= all valid values. ZERO for codepoints
|
||||
const UChar32 UnicodeSet::HIGH = 0x10000; // HIGH > all valid values. 110000 for codepoints
|
||||
|
||||
|
||||
/**
|
||||
* Minimum value that can be stored in a UnicodeSet.
|
||||
|
@ -23,6 +23,7 @@
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
#include <cstring.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
# include <windows.h>
|
||||
@ -649,7 +650,7 @@ long convertFirstLine( FILE* inF, char* inEncName,
|
||||
}
|
||||
|
||||
char* tempString = " encoding=";
|
||||
char* dupFLB = strdup(pFLB);
|
||||
char* dupFLB = uprv_strdup(pFLB);
|
||||
int stringTwoLength = 0;
|
||||
|
||||
/* build up the length */
|
||||
|
@ -13,7 +13,20 @@
|
||||
#if defined(POSIX)||defined(SOLARIS)||defined(AIX)||defined(HPUX)
|
||||
#define HAVE_IMP
|
||||
|
||||
#if defined(__hpux) && defined(HPUX_CMA)
|
||||
# ifndef _INCLUDE_POSIX_SOURCE
|
||||
# define _INCLUDE_POSIX_SOURCE
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <pthread.h>
|
||||
|
||||
#if defined(__hpux) && defined(HPUX_CMA)
|
||||
# if defined(read) // read being defined as cma_read causes trouble with iostream::read
|
||||
# undef read
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
/* Define _XPG4_2 for Solaris and friends. */
|
||||
|
Loading…
Reference in New Issue
Block a user