Changed the unicode string API and ported to ARM/WinCE

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@182 74dad513-b988-da41-8d7b-12977e46ad98
author: Benny Prijono <bennylp@teluu.com> 2006-02-14 21:04:47 +0000
committer: Benny Prijono <bennylp@teluu.com> 2006-02-14 21:04:47 +0000
commit: c672d0e3ecea6fe784250b5099f8126c0ff18ad1 (patch)
tree: 6540b7d4175fe7f2648270329345c2f50ff91be9
parent: cec9d0501ccdf37cb82e398df6ec4e5bd4e1ac01 (diff)
7 files changed, 220 insertions, 29 deletions
diff --git a/pjlib/build/wince-evc4/pjlib_wince.vcp b/pjlib/build/wince-evc4/pjlib_wince.vcp
index 704f70dd..c89f8601 100644
--- a/pjlib/build/wince-evc4/pjlib_wince.vcp
+++ b/pjlib/build/wince-evc4/pjlib_wince.vcp
@@ -390,7 +390,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../include" /D "ARM" /D "_ARM_" /D "ARMV4I" /D "NDEBUG" /D PJ_WIN32_WINCE=1 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../include" /D "ARMV4I" /D "NDEBUG" /D "ARM" /D "_ARM_" /D PJ_WIN32_WINCE=1 /D PJ_M_ARMV4=1 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -416,7 +416,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4I" /D PJ_WIN32_WINCE=1 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D "ARMV4I" /D "ARM" /D "_ARM_" /D PJ_WIN32_WINCE=1 /D PJ_M_ARMV4=1 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -494,7 +494,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../include" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D PJ_WIN32_WINCE=1 /D PJ_M_ARMV4=1 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../include" /D "NDEBUG" /D "ARMV4" /D PJ_M_ARMV4=1 /D "ARM" /D "_ARM_" /D PJ_WIN32_WINCE=1 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -520,7 +520,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D PJ_WIN32_WINCE=1 /D PJ_M_ARMV4=1 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D "ARMV4" /D PJ_M_ARMV4=1 /D "ARM" /D "_ARM_" /D PJ_WIN32_WINCE=1 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -598,7 +598,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=clthumb.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../include" /D "ARM" /D "_ARM_" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D "NDEBUG" /D PJ_WIN32_WINCE=1 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../include" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D "NDEBUG" /D "ARM" /D "_ARM_" /D PJ_WIN32_WINCE=1 /D PJ_M_ARMV4=1 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -624,7 +624,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=clthumb.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D PJ_WIN32_WINCE=1 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D "ARM" /D "_ARM_" /D PJ_WIN32_WINCE=1 /D PJ_M_ARMV4=1 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -1306,6 +1306,7 @@ DEP_CPP_ADDR_=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -1559,6 +1560,7 @@ DEP_CPP_ADDR_=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -2163,6 +2165,7 @@ DEP_CPP_ARRAY=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -2409,6 +2412,7 @@ DEP_CPP_ARRAY=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -2816,6 +2820,7 @@ DEP_CPP_CONFI=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -2978,6 +2983,7 @@ DEP_CPP_CONFI=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -3378,6 +3384,7 @@ DEP_CPP_CTYPE=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\ctype.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -3540,6 +3547,7 @@ DEP_CPP_CTYPE=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\ctype.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -3922,6 +3930,7 @@ DEP_CPP_EQUEU=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -4077,6 +4086,7 @@ DEP_CPP_EQUEU=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -4616,10 +4626,13 @@ DEP_CPP_ERRNO=\
 !ELSEIF  "$(CFG)" == "pjlib_wince - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_ERRNO=\
+	"..\..\include\pj\assert.h"\
+	"..\..\include\pj\compat\assert.h"\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -4841,10 +4854,13 @@ DEP_CPP_ERRNO=\
 !ELSEIF  "$(CFG)" == "pjlib_wince - Win32 (WCE x86) Debug"
 
 DEP_CPP_ERRNO=\
+	"..\..\include\pj\assert.h"\
+	"..\..\include\pj\compat\assert.h"\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -5351,6 +5367,7 @@ DEP_CPP_EXCEP=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -5555,6 +5572,7 @@ DEP_CPP_EXCEP=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -6007,6 +6025,7 @@ DEP_CPP_FIFOB=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -6190,6 +6209,7 @@ DEP_CPP_FIFOB=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -6651,6 +6671,7 @@ DEP_CPP_FILE_=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -6661,11 +6682,22 @@ DEP_CPP_FILE_=\
 	"..\..\include\pj\compat\os_win32.h"\
 	"..\..\include\pj\compat\os_win32_wince.h"\
 	"..\..\include\pj\compat\size_t.h"\
+	"..\..\include\pj\compat\sprintf.h"\
+	"..\..\include\pj\compat\string.h"\
+	"..\..\include\pj\compat\vsprintf.h"\
 	"..\..\include\pj\config.h"\
 	"..\..\include\pj\config_site.h"\
 	"..\..\include\pj\errno.h"\
 	"..\..\include\pj\file_access.h"\
+	"..\..\include\pj\list.h"\
+	"..\..\include\pj\list_i.h"\
+	"..\..\include\pj\os.h"\
+	"..\..\include\pj\pool.h"\
+	"..\..\include\pj\pool_i.h"\
+	"..\..\include\pj\string.h"\
+	"..\..\include\pj\string_i.h"\
 	"..\..\include\pj\types.h"\
+	"..\..\include\pj\unicode.h"\
 	
 
 !ELSEIF  "$(CFG)" == "pjlib_wince - Win32 (WCE ARMV4) Debug"
@@ -6690,7 +6722,6 @@ DEP_CPP_FILE_=\
 	"..\..\include\pj\compat\size_t.h"\
 	"..\..\include\pj\compat\sprintf.h"\
 	"..\..\include\pj\compat\string.h"\
-	"..\..\include\pj\compat\unicode.h"\
 	"..\..\include\pj\compat\vsprintf.h"\
 	"..\..\include\pj\config.h"\
 	"..\..\include\pj\config_site.h"\
@@ -6705,6 +6736,9 @@ DEP_CPP_FILE_=\
 	"..\..\include\pj\string_i.h"\
 	"..\..\include\pj\types.h"\
 	
+NODEP_CPP_FILE_=\
+	"..\..\include\pj\compat\unicode.h"\
+	
 
 !ELSEIF  "$(CFG)" == "pjlib_wince - Win32 (WCE MIPS16) Release"
 
@@ -6845,6 +6879,7 @@ DEP_CPP_FILE_=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -6857,7 +6892,6 @@ DEP_CPP_FILE_=\
 	"..\..\include\pj\compat\size_t.h"\
 	"..\..\include\pj\compat\sprintf.h"\
 	"..\..\include\pj\compat\string.h"\
-	"..\..\include\pj\compat\unicode.h"\
 	"..\..\include\pj\compat\vsprintf.h"\
 	"..\..\include\pj\config.h"\
 	"..\..\include\pj\config_site.h"\
@@ -6871,6 +6905,7 @@ DEP_CPP_FILE_=\
 	"..\..\include\pj\string.h"\
 	"..\..\include\pj\string_i.h"\
 	"..\..\include\pj\types.h"\
+	"..\..\include\pj\unicode.h"\
 	
 
 !ENDIF 
@@ -7306,6 +7341,7 @@ DEP_CPP_FILE_I=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -7321,6 +7357,7 @@ DEP_CPP_FILE_I=\
 	"..\..\include\pj\errno.h"\
 	"..\..\include\pj\file_io.h"\
 	"..\..\include\pj\types.h"\
+	"..\..\include\pj\unicode.h"\
 	
 
 !ELSEIF  "$(CFG)" == "pjlib_wince - Win32 (WCE ARMV4) Debug"
@@ -7343,13 +7380,15 @@ DEP_CPP_FILE_I=\
 	"..\..\include\pj\compat\os_win32.h"\
 	"..\..\include\pj\compat\os_win32_wince.h"\
 	"..\..\include\pj\compat\size_t.h"\
-	"..\..\include\pj\compat\unicode.h"\
 	"..\..\include\pj\config.h"\
 	"..\..\include\pj\config_site.h"\
 	"..\..\include\pj\errno.h"\
 	"..\..\include\pj\file_io.h"\
 	"..\..\include\pj\types.h"\
 	
+NODEP_CPP_FILE_I=\
+	"..\..\include\pj\compat\unicode.h"\
+	
 
 !ELSEIF  "$(CFG)" == "pjlib_wince - Win32 (WCE MIPS16) Release"
 
@@ -7490,6 +7529,7 @@ DEP_CPP_FILE_I=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -7500,12 +7540,12 @@ DEP_CPP_FILE_I=\
 	"..\..\include\pj\compat\os_win32.h"\
 	"..\..\include\pj\compat\os_win32_wince.h"\
 	"..\..\include\pj\compat\size_t.h"\
-	"..\..\include\pj\compat\unicode.h"\
 	"..\..\include\pj\config.h"\
 	"..\..\include\pj\config_site.h"\
 	"..\..\include\pj\errno.h"\
 	"..\..\include\pj\file_io.h"\
 	"..\..\include\pj\types.h"\
+	"..\..\include\pj\unicode.h"\
 	
 
 !ENDIF 
@@ -8018,6 +8058,7 @@ DEP_CPP_GUID_=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -8236,6 +8277,7 @@ DEP_CPP_GUID_=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -8803,6 +8845,7 @@ DEP_CPP_GUID_S=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -9035,6 +9078,7 @@ DEP_CPP_GUID_S=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -9633,10 +9677,13 @@ DEP_CPP_HASH_=\
 !ELSEIF  "$(CFG)" == "pjlib_wince - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_HASH_=\
+	"..\..\include\pj\assert.h"\
+	"..\..\include\pj\compat\assert.h"\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\ctype.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -9879,10 +9926,13 @@ DEP_CPP_HASH_=\
 !ELSEIF  "$(CFG)" == "pjlib_wince - Win32 (WCE x86) Debug"
 
 DEP_CPP_HASH_=\
+	"..\..\include\pj\assert.h"\
+	"..\..\include\pj\compat\assert.h"\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\ctype.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -10625,6 +10675,7 @@ DEP_CPP_IOQUE=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -10927,6 +10978,7 @@ DEP_CPP_IOQUE=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -11343,6 +11395,7 @@ DEP_CPP_LIST_=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -11505,6 +11558,7 @@ DEP_CPP_LIST_=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -12115,6 +12169,7 @@ DEP_CPP_LOCK_=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -12368,6 +12423,7 @@ DEP_CPP_LOCK_=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -12937,6 +12993,7 @@ DEP_CPP_LOG_C=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -13169,6 +13226,7 @@ DEP_CPP_LOG_C=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -13594,6 +13652,7 @@ DEP_CPP_LOG_W=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -13763,6 +13822,7 @@ DEP_CPP_LOG_W=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -14438,6 +14498,7 @@ DEP_CPP_OS_CO=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -14719,6 +14780,7 @@ DEP_CPP_OS_CO=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -15327,6 +15389,7 @@ DEP_CPP_OS_ER=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -15351,6 +15414,7 @@ DEP_CPP_OS_ER=\
 	"..\..\include\pj\string.h"\
 	"..\..\include\pj\string_i.h"\
 	"..\..\include\pj\types.h"\
+	"..\..\include\pj\unicode.h"\
 	
 
 !ELSEIF  "$(CFG)" == "pjlib_wince - Win32 (WCE ARMV4) Debug"
@@ -15573,6 +15637,7 @@ DEP_CPP_OS_ER=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -15597,6 +15662,7 @@ DEP_CPP_OS_ER=\
 	"..\..\include\pj\string.h"\
 	"..\..\include\pj\string_i.h"\
 	"..\..\include\pj\types.h"\
+	"..\..\include\pj\unicode.h"\
 	
 
 !ENDIF 
@@ -15974,6 +16040,7 @@ DEP_CPP_OS_TI=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -15984,9 +16051,18 @@ DEP_CPP_OS_TI=\
 	"..\..\include\pj\compat\os_win32.h"\
 	"..\..\include\pj\compat\os_win32_wince.h"\
 	"..\..\include\pj\compat\size_t.h"\
+	"..\..\include\pj\compat\sprintf.h"\
+	"..\..\include\pj\compat\string.h"\
+	"..\..\include\pj\compat\vsprintf.h"\
 	"..\..\include\pj\config.h"\
 	"..\..\include\pj\config_site.h"\
+	"..\..\include\pj\list.h"\
+	"..\..\include\pj\list_i.h"\
 	"..\..\include\pj\os.h"\
+	"..\..\include\pj\pool.h"\
+	"..\..\include\pj\pool_i.h"\
+	"..\..\include\pj\string.h"\
+	"..\..\include\pj\string_i.h"\
 	"..\..\include\pj\types.h"\
 	
 
@@ -16138,6 +16214,7 @@ DEP_CPP_OS_TI=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -16546,6 +16623,7 @@ DEP_CPP_OS_TIM=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\high_precision.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -16708,6 +16786,7 @@ DEP_CPP_OS_TIM=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\high_precision.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -17123,6 +17202,7 @@ DEP_CPP_OS_TIME=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -17292,6 +17372,7 @@ DEP_CPP_OS_TIME=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -17901,6 +17982,7 @@ DEP_CPP_POOL_=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -18154,6 +18236,7 @@ DEP_CPP_POOL_=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -18742,6 +18825,7 @@ DEP_CPP_POOL_C=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -18981,6 +19065,7 @@ DEP_CPP_POOL_C=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -19565,6 +19650,7 @@ DEP_CPP_POOL_P=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -19804,6 +19890,7 @@ DEP_CPP_POOL_P=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -20230,6 +20317,7 @@ DEP_CPP_RAND_=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -20399,6 +20487,7 @@ DEP_CPP_RAND_=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -20799,6 +20888,7 @@ DEP_CPP_RBTRE=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -20961,6 +21051,7 @@ DEP_CPP_RBTRE=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -21604,6 +21695,7 @@ DEP_CPP_SOCK_=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -21871,6 +21963,7 @@ DEP_CPP_SOCK_=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -22364,6 +22457,7 @@ DEP_CPP_SOCK_S=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -22561,6 +22655,7 @@ DEP_CPP_SOCK_S=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -23139,6 +23234,7 @@ DEP_CPP_STRIN=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\ctype.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -23378,6 +23474,7 @@ DEP_CPP_STRIN=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\ctype.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -24014,6 +24111,7 @@ DEP_CPP_TIMER=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -24274,6 +24372,7 @@ DEP_CPP_TIMER=\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\errno.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -24668,6 +24767,7 @@ DEP_CPP_TYPES=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -24823,6 +24923,7 @@ DEP_CPP_TYPES=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
+	"..\..\include\pj\compat\m_arm.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -25382,7 +25483,7 @@ DEP_CPP_UNICO=\
 	"..\..\include\pj\compat\cc_gcc.h"\
 	"..\..\include\pj\compat\cc_msvc.h"\
 	"..\..\include\pj\compat\m_alpha.h"\
-	"..\..\include\pj\compat\m_arm.h"\
+	"..\..\include\pj\compat\m_armv4.h"\
 	"..\..\include\pj\compat\m_i386.h"\
 	"..\..\include\pj\compat\m_m68k.h"\
 	"..\..\include\pj\compat\m_sparc.h"\
@@ -25405,6 +25506,7 @@ DEP_CPP_UNICO=\
 	"..\..\include\pj\string.h"\
 	"..\..\include\pj\string_i.h"\
 	"..\..\include\pj\types.h"\
+	"..\..\include\pj\unicode.h"\
 	
 
 !ELSEIF  "$(CFG)" == "pjlib_wince - Win32 (WCE ARMV4) Debug"
@@ -25636,6 +25738,7 @@ DEP_CPP_UNICO=\
 	"..\..\include\pj\string.h"\
 	"..\..\include\pj\string_i.h"\
 	"..\..\include\pj\types.h"\
+	"..\..\include\pj\unicode.h"\
 	
 
 !ENDIF 
@@ -25654,6 +25757,10 @@ SOURCE=..\..\include\pj\compat\assert.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\pj\compat\cc_gcc.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\pj\compat\cc_msvc.h
 # End Source File
 # Begin Source File
@@ -25670,7 +25777,7 @@ SOURCE=..\..\include\pj\compat\high_precision.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\pj\compat\m_arm.h
+SOURCE=..\..\include\pj\compat\m_armv4.h
 # End Source File
 # Begin Source File
 
@@ -25811,6 +25918,10 @@ SOURCE=..\..\include\pj\os.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\pjlib.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\pj\pool.h
 # End Source File
 # Begin Source File
diff --git a/pjlib/include/pj/compat/m_arm.h b/pjlib/include/pj/compat/m_armv4.h
index b81ce32c..e43d4156 100644
--- a/pjlib/include/pj/compat/m_arm.h
+++ b/pjlib/include/pj/compat/m_armv4.h
@@ -16,11 +16,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#ifndef __PJ_COMPAT_M_ARM_H__
-#define __PJ_COMPAT_M_ARM_H__
+#ifndef __PJ_COMPAT_M_ARMV4_H__
+#define __PJ_COMPAT_M_ARMV4_H__
 
 /**
- * @file m_arm.h
+ * @file m_armv4.h
  * @brief Describes ARM family processor specifics.
  */
 
@@ -28,11 +28,11 @@
  * This file covers PJ_M_ARMV4 etc.
  */
 
-#define PJ_M_NAME		"ARM"
+#define PJ_M_NAME		"armv4"
 
 #define PJ_HAS_PENTIUM		0
 #define PJ_IS_LITTLE_ENDIAN	1
 #define PJ_IS_BIG_ENDIAN	0
 
 
-#endif	/* __PJ_COMPAT_M_ARM_H__ */
+#endif	/* __PJ_COMPAT_M_ARMV4_H__ */
diff --git a/pjlib/include/pj/compat/socket.h b/pjlib/include/pj/compat/socket.h
index ee4f3a6e..e3f68b5d 100644
--- a/pjlib/include/pj/compat/socket.h
+++ b/pjlib/include/pj/compat/socket.h
@@ -76,7 +76,8 @@
 /*
  * Define common errors.
  */
-#ifdef PJ_WIN32
+#if (defined(PJ_WIN32) && PJ_WIN32!=0) || \
+    (defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE!=0)
 #  define OSERR_EWOULDBLOCK    WSAEWOULDBLOCK
 #  define OSERR_EINPROGRESS    WSAEINPROGRESS
 #  define OSERR_ECONNRESET     WSAECONNRESET
diff --git a/pjlib/include/pj/compat/string.h b/pjlib/include/pj/compat/string.h
index fd041230..8fd45286 100644
--- a/pjlib/include/pj/compat/string.h
+++ b/pjlib/include/pj/compat/string.h
@@ -24,6 +24,16 @@
  * @brief Provides string manipulation functions found in ANSI string.h.
  */
 
+/**
+ * Native char type, which will be equal to wchar_t for Unicode
+ * and char for ANSI.
+ */
+#if defined(PJ_NATIVE_STRING_IS_UNICODE) && PJ_NATIVE_STRING_IS_UNICODE!=0
+typedef wchar_t pj_char_t;
+#else
+typedef char pj_char_t;
+#endif
+
 #if defined(PJ_HAS_STRING_H) && PJ_HAS_STRING_H != 0
 #  include <string.h>
 #else
@@ -41,21 +51,72 @@
 #   define strncasecmp	strnicmp
 #  endif
 #  define snprintf	_snprintf
+#  define wcsicmp	_wcsicmp
+#  define wcsnicmp	_wcsnicmp
 #else
 #  define stricmp	strcasecmp
 #  define strnicmp	strncasecmp
+
+#  if defined(PJ_NATIVE_STRING_IS_UNICODE) && PJ_NATIVE_STRING_IS_UNICODE!=0
+#     error "Implement Unicode string functions"
+#  endif
 #endif
 
 
-#define pj_native_strcmp        strcmp
-#define pj_native_strncmp	strncmp
-#define pj_native_strlen        strlen
-#define pj_native_strcpy        strcpy
-#define pj_native_strstr        strstr
-#define pj_native_strchr        strchr
-#define pj_native_strcasecmp    strcasecmp
-#define pj_native_stricmp	strcasecmp
-#define pj_native_strncasecmp   strncasecmp
-#define pj_native_strnicmp	strncasecmp
+#define pj_ansi_strcmp		strcmp
+#define pj_ansi_strncmp		strncmp
+#define pj_ansi_strlen		strlen
+#define pj_ansi_strcpy		strcpy
+#define pj_ansi_strcat		strcat
+#define pj_ansi_strstr		strstr
+#define pj_ansi_strchr		strchr
+#define pj_ansi_strcasecmp	strcasecmp
+#define pj_ansi_stricmp		strcasecmp
+#define pj_ansi_strncasecmp	strncasecmp
+#define pj_ansi_strnicmp	strncasecmp
+#define pj_ansi_sprintf		sprintf
+
+#define pj_unicode_strcmp	wcscmp
+#define pj_unicode_strncmp	wcsncmp
+#define pj_unicode_strlen	wcslen
+#define pj_unicode_strcpy	wcscpy
+#define pj_unicode_strcat	wcscat
+#define pj_unicode_strstr	wcsstr
+#define pj_unicode_strchr	wcschr
+#define pj_unicode_strcasecmp	wcsicmp
+#define pj_unicode_stricmp	wcsicmp
+#define pj_unicode_strncasecmp	wcsnicmp
+#define pj_unicode_strnicmp	wcsnicmp
+#define pj_unicode_sprintf	swprintf
+
+
+#if defined(PJ_NATIVE_STRING_IS_UNICODE) && PJ_NATIVE_STRING_IS_UNICODE!=0
+#   define pj_native_strcmp	    pj_unicode_strcmp
+#   define pj_native_strncmp	    pj_unicode_strncmp
+#   define pj_native_strlen	    pj_unicode_strlen
+#   define pj_native_strcpy	    pj_unicode_strcpy
+#   define pj_native_strcat	    pj_unicode_strcat
+#   define pj_native_strstr	    pj_unicode_strstr
+#   define pj_native_strchr	    pj_unicode_strchr
+#   define pj_native_strcasecmp	    pj_unicode_strcasecmp
+#   define pj_native_stricmp	    pj_unicode_stricmp
+#   define pj_native_strncasecmp    pj_unicode_strncasecmp
+#   define pj_native_strnicmp	    pj_unicode_strnicmp
+#   define pj_native_sprintf	    pj_unicode_sprintf
+#else
+#   define pj_native_strcmp	    pj_ansi_strcmp
+#   define pj_native_strncmp	    pj_ansi_strncmp
+#   define pj_native_strlen	    pj_ansi_strlen
+#   define pj_native_strcpy	    pj_ansi_strcpy
+#   define pj_native_strcat	    pj_ansi_strcat
+#   define pj_native_strstr	    pj_ansi_strstr
+#   define pj_native_strchr	    pj_ansi_strchr
+#   define pj_native_strcasecmp	    pj_ansi_strcasecmp
+#   define pj_native_stricmp	    pj_ansi_stricmp
+#   define pj_native_strncasecmp    pj_ansi_strncasecmp
+#   define pj_native_strnicmp	    pj_ansi_strnicmp
+#   define pj_native_sprintf	    pj_ansi_sprintf
+#endif
+
 
 #endif	/* __PJ_COMPAT_STRING_H__ */
diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h
index b836b53b..d09795a4 100644
--- a/pjlib/include/pj/config.h
+++ b/pjlib/include/pj/config.h
@@ -68,7 +68,7 @@
 #elif defined (PJ_M_SPARC) && PJ_M_SPARC != 0
 #   include <pj/compat/m_sparc.h>
 #elif defined (PJ_M_ARMV4) && PJ_M_ARMV4 != 0
-#   include <pj/compat/m_arm.h>
+#   include <pj/compat/m_armv4.h>
 #else
 #  error "Please specify target machine."
 #endif
diff --git a/pjlib/include/pj/types.h b/pjlib/include/pj/types.h
index 5b22f75b..69d440a9 100644
--- a/pjlib/include/pj/types.h
+++ b/pjlib/include/pj/types.h
@@ -68,6 +68,23 @@ typedef int		pj_status_t;
 /** Boolean. */
 typedef int		pj_bool_t;
 
+/** Native char type, which will be equal to wchar_t for Unicode
+ * and char for ANSI. */
+#if defined(PJ_NATIVE_STRING_IS_UNICODE) && PJ_NATIVE_STRING_IS_UNICODE!=0
+    typedef wchar_t pj_char_t;
+#else
+    typedef char pj_char_t;
+#endif
+
+/** This macro creates Unicode or ANSI literal string depending whether
+ *  native platform string is Unicode or ANSI. */
+#if defined(PJ_NATIVE_STRING_IS_UNICODE) && PJ_NATIVE_STRING_IS_UNICODE!=0
+#   define PJ_T(literal_str)	L##literal_str
+#else
+#   define PJ_T(literal_str)	literal_str
+#endif
+
+
 /** Status is OK. */
 #define PJ_SUCCESS  0
 
diff --git a/pjlib/include/pjlib.h b/pjlib/include/pjlib.h
index 45a9e495..2e2ffd0d 100644
--- a/pjlib/include/pjlib.h
+++ b/pjlib/include/pjlib.h
@@ -48,6 +48,7 @@
 #include <pj/sock_select.h>
 #include <pj/string.h>
 #include <pj/timer.h>
+#include <pj/unicode.h>
 
 #include <pj/compat/high_precision.h>
author	Benny Prijono <bennylp@teluu.com>	2006-02-14 21:04:47 +0000
committer	Benny Prijono <bennylp@teluu.com>	2006-02-14 21:04:47 +0000
commit	c672d0e3ecea6fe784250b5099f8126c0ff18ad1 (patch)
tree	6540b7d4175fe7f2648270329345c2f50ff91be9
parent	cec9d0501ccdf37cb82e398df6ec4e5bd4e1ac01 (diff)