[Dotgnu-pnet-commits] CVS: pnetlib/I18N/CJK CP932.cs, 1.4, 1.5 CodeTable.cs, 1.3, 1.4 JISConvert.cs, 1.3, 1.4

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/I18N/CJK
In directory subversions:/tmp/cvs-serv19345/I18N/CJK

Modified Files:
        CP932.cs CodeTable.cs JISConvert.cs 
Log Message:


Remove the "__PNET__" symbol from the I18N code, because it is obsolete.


Index: CP932.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/CJK/CP932.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** CP932.cs    16 Apr 2003 07:12:11 -0000      1.4
--- CP932.cs    13 Aug 2003 02:12:26 -0000      1.5
***************
*** 63,73 ****
                                int length = 0;
                                int ch, value;
- #if __PNET__
                                byte *cjkToJis = convert.cjkToJis;
                                byte *extraToJis = convert.extraToJis;
- #else
-                               byte[] cjkToJis = convert.cjkToJis;
-                               byte[] extraToJis = convert.extraToJis;
- #endif
                                while(count > 0)
                                {
--- 63,68 ----
***************
*** 159,171 ****
                                int byteLength = bytes.Length;
                                int ch, value;
- #if __PNET__
                                byte *cjkToJis = convert.cjkToJis;
                                byte *greekToJis = convert.greekToJis;
                                byte *extraToJis = convert.extraToJis;
- #else
-                               byte[] cjkToJis = convert.cjkToJis;
-                               byte[] greekToJis = convert.greekToJis;
-                               byte[] extraToJis = convert.extraToJis;
- #endif
                                while(charCount > 0)
                                {
--- 154,160 ----
***************
*** 435,443 ****
                                int length = 0;
                                int byteval, value;
- #if __PNET__
                                byte *table = convert.jisx0208ToUnicode;
- #else
-                               byte[] table = convert.jisx0208ToUnicode;
- #endif
                                while(byteCount > 0)
                                {
--- 424,428 ----
***************
*** 739,747 ****
                                        int byteval, value;
                                        int last = lastByte;
- #if __PNET__
                                        byte *table = convert.jisx0208ToUnicode;
- #else
-                                       byte[] table = 
convert.jisx0208ToUnicode;
- #endif
                                        while(byteCount > 0)
                                        {
--- 724,728 ----

Index: CodeTable.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/CJK/CodeTable.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** CodeTable.cs        16 Apr 2003 07:12:11 -0000      1.3
--- CodeTable.cs        13 Aug 2003 02:12:26 -0000      1.4
***************
*** 69,77 ****
        // the code table.  This address is guaranteed to persist
        // after "Dispose" is called.
- #if __PNET__
        public byte *GetSection(int num)
- #else
-       public byte[] GetSection(int num)
- #endif
                        {
                                // If the table has been disposed, then bail 
out.
--- 69,73 ----
***************
*** 108,121 ****
                                        if(sectNum == num)
                                        {
- #if __PNET__
                                                return GetAddress(stream, posn 
+ 8);
- #else
-                                               byte[] buf = new byte [sectLen];
-                                               if(stream.Read(buf, 0, sectLen) 
!= sectLen)
-                                               {
-                                                       break;
-                                               }
-                                               return buf;
- #endif
                                        }
  
--- 104,108 ----
***************
*** 128,137 ****
                        }
  
- #if __PNET__
        // Back door access into the engine to get the address of
        // an offset within a manifest resource stream.
        [MethodImpl(MethodImplOptions.InternalCall)]
        extern private static byte *GetAddress(Stream stream, long position);
- #endif
  
  }; // class CodeTable
--- 115,122 ----

Index: JISConvert.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/CJK/JISConvert.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** JISConvert.cs       16 Apr 2003 07:12:11 -0000      1.3
--- JISConvert.cs       13 Aug 2003 02:12:26 -0000      1.4
***************
*** 39,43 ****
  
        // Public access to the conversion tables.
- #if __PNET__
        public byte *jisx0208ToUnicode;
        public byte *jisx0212ToUnicode;
--- 39,42 ----
***************
*** 45,55 ****
        public byte *greekToJis;
        public byte *extraToJis;
- #else
-       public byte[] jisx0208ToUnicode;
-       public byte[] jisx0212ToUnicode;
-       public byte[] cjkToJis;
-       public byte[] greekToJis;
-       public byte[] extraToJis;
- #endif
  
        // Constructor.
--- 44,47 ----