Update of /cvsroot/squeak/squeak/platforms/unix/vm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23350
Modified Files:
sqUnixCharConv.c
Log Message:
Use Solaris-specific encoding names on Sparc.
Index: sqUnixCharConv.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/vm/sqUnixCharConv.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sqUnixCharConv.c 1 Sep 2003 08:31:53 -0000 1.4
--- sqUnixCharConv.c 2 Apr 2004 01:02:54 -0000 1.5
***************
*** 36,40 ****
* directory `platforms/unix/doc' before proceeding with any such use.
*
! * Last edited: 2003-03-05 06:44:50 by piumarta on emilia.inria.fr
*/
--- 36,40 ----
* directory `platforms/unix/doc' before proceeding with any such use.
*
! * Last edited: 2003-09-30 04:50:04 by piumarta on emilia.inria.fr
*/
***************
*** 64,68 ****
// we have to do something special on MacOSX (surprise surprise) because:
! // - MacOSX isn't Unix98 compliant and lacks builtin iconv functions
// - the free libiconv cannot handle the canonical decomposition used in HFS+
// ho hum dee dumb
--- 64,68 ----
// we have to do something special on MacOSX (surprise surprise) because:
! // - MacOSX is not Unix98 compliant and lacks builtin iconv functions
// - the free libiconv cannot handle the canonical decomposition used in HFS+
// ho hum dee dumb
***************
*** 90,94 ****
{ "LATIN1", (void *)kCFStringEncodingISOLatin1 },
{ "ISO-8859-1", (void *)kCFStringEncodingISOLatin1 },
! // there are many tens of these and I can't be bothered.
{ 0, 0 }
};
--- 90,94 ----
{ "LATIN1", (void *)kCFStringEncodingISOLatin1 },
{ "ISO-8859-1", (void *)kCFStringEncodingISOLatin1 },
! // there are many tens of these and I cannot be bothered.
{ 0, 0 }
};
***************
*** 152,160 ****
typedef char ichar_t;
void *sqTextEncoding= (void *)"MACINTOSH"; /* xxxFIXME -> "ISO-8859-15" */
- void *uxTextEncoding= (void *)"ISO-8859-15";
void *uxPathEncoding= (void *)"UTF-8";
! void *uxUTF8Encoding= (void *)"UTF-8";
void *uxXWinEncoding= (void *)"ISO-8859-1";
void setEncoding(void **encoding, char *rawName)
--- 152,168 ----
typedef char ichar_t;
+ #ifdef __sparc
+ void *sqTextEncoding= (void *)"mac"; /* xxxFIXME -> "ISO-8859-15" */
+ void *uxPathEncoding= (void *)"iso";
+ void *uxTextEncoding= (void *)"iso";
+ void *uxXWinEncoding= (void *)"iso";
+ void *uxUTF8Encoding= (void *)"UTF-8";
+ #else
void *sqTextEncoding= (void *)"MACINTOSH"; /* xxxFIXME -> "ISO-8859-15" */
void *uxPathEncoding= (void *)"UTF-8";
! void *uxTextEncoding= (void *)"ISO-8859-15";
void *uxXWinEncoding= (void *)"ISO-8859-1";
+ void *uxUTF8Encoding= (void *)"UTF-8";
+ #endif
void setEncoding(void **encoding, char *rawName)
***************
*** 163,168 ****
--- 171,178 ----
int len= strlen(name);
int i;
+ #ifndef __sparc
for (i= 0; i < len; ++i)
name[i]= toupper(name[i]);
+ #endif
if (!strcmp(name, "MACROMAN")) *encoding= "MACINTOSH";
else if (!strcmp(name, "MAC-ROMAN")) *encoding= "MACINTOSH";
|
