further Symbian/S90 fixes from alexander smishlajev

Message-Id: <20070126035150.41A4143A67@anubis.hut.fi>

p4raw-id: //depot/perl@29990

4 files changed, 15 insertions, 15 deletions

diff --git a/symbian/PerlBase.cpp b/symbian/PerlBase.cpp
index 443ae0b953..851fc15673 100644
--- a/symbian/PerlBase.cpp
+++ b/symbian/PerlBase.cpp
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2005 Nokia. All rights reserved. */
- 
+
 /* The CPerlBase class is licensed under the same terms as Perl itself. */
 
 /* See PerlBase.pod for documentation. */
@@ -193,7 +193,7 @@ EXPORT_C TInt CPerlBase::RunScriptL(const TDesC& aFileName,
     Argv = 0;
     return error == 0 ? KErrNone : KErrGeneral;
 }
-    
+
 
 EXPORT_C int CPerlBase::Parse(int argc, char *argv[], char *envp[])
 {
@@ -230,7 +230,7 @@ EXPORT_C int CPerlBase::Run()
         iState = EPerlRunning;
         int ran = perl_run(iPerl);
         iState = (ran == 0) ? EPerlSuccess : EPerlFailure;
-        return ran; 
+        return ran;
     } else
         return -1;
 }
@@ -264,7 +264,7 @@ int CPerlBase::ConsoleReadLine()
                 iConsoleBuffer[offset++] = 0;
             }
             break;
-        } 
+        }
         else {
             TBool doBackward  = EFalse;
             TBool doBackspace = EFalse;
@@ -318,26 +318,26 @@ int CPerlBase::ConsoleRead(const int fd, char* buf, int n)
         errno = EIO;
         return -1;
     }
-   
+
     if (n < 0) {
         errno = EINVAL;
         return -1;
     }
-    
+
     if (n == 0)
         return 0;
- 
+
     TBuf8<4 * KPerlConsoleBufferMaxTChars> aBufferUtf8;
     TBuf16<KPerlConsoleBufferMaxTChars>    aBufferUtf16;
     int length = ConsoleReadLine();
-    int i;    
+    int i;
 
     iConsoleUsed += length;
 
     aBufferUtf16.SetLength(length);
     for (i = 0; i < length; i++)
         aBufferUtf16[i] = iConsoleBuffer[i];
-    aBufferUtf8.SetLength(4 * length); 
+    aBufferUtf8.SetLength(4 * length);
 
     CnvUtfConverter::ConvertFromUnicodeToUtf8(aBufferUtf8, aBufferUtf16);
 
@@ -358,7 +358,7 @@ int CPerlBase::ConsoleRead(const int fd, char* buf, int n)
             return -1;
         }
         buf[i] = u;
-    } 
+    }
 #endif
     if (nUtf8 < n)
         buf[nUtf8] = 0;
diff --git a/symbian/config.sh b/symbian/config.sh
index 206c9bc358..5645808d1a 100644
--- a/symbian/config.sh
+++ b/symbian/config.sh
@@ -84,8 +84,8 @@ d_cplusplus='undef'
 d_crypt='undef'
 d_crypt_r='undef'
 d_csh='undef'
+d_ctermid='undef'
 d_ctermid_r='undef'
-d_cterm='undef'
 d_ctime_r='undef'
 d_c99_variadic_macros='undef'
 d_cuserid='undef'
diff --git a/symbian/symbianish.h b/symbian/symbianish.h
index 4eaffc3b07..b8e6940e07 100644
--- a/symbian/symbianish.h
+++ b/symbian/symbianish.h
@@ -22,7 +22,7 @@
  *	available to set I/O characteristics
  */
 #define	HAS_IOCTL		/ **/
- 
+
 /* HAS_UTIME:
  *	This symbol, if defined, indicates that the routine utime() is
  *	available to update the access and modification times of files.
@@ -47,7 +47,7 @@
 #undef HAS_WAIT
 
 #endif /* !PERL_MICRO */
-  
+
 /* USEMYBINMODE
  *	This symbol, if defined, indicates that the program should
  *	use the routine my_binmode(FILE *fp, char iotype) to insure
@@ -71,7 +71,7 @@
 #define USE_STAT_RDEV 	/**/
 
 /* ACME_MESS:
- *	This symbol, if defined, indicates that error messages should be 
+ *	This symbol, if defined, indicates that error messages should be
  *	should be generated in a format that allows the use of the Acme
  *	GUI/editor's autofind feature.
  */
diff --git a/symbian/xsbuild.pl b/symbian/xsbuild.pl
index 84d0a63fca..5fbf4aeb5c 100644
--- a/symbian/xsbuild.pl
+++ b/symbian/xsbuild.pl
@@ -6,6 +6,7 @@ use Getopt::Long;
 use File::Basename;
 use Cwd;
 
+unshift @INC, dirname $0 or '.';
 do "sanity.pl" or die $@;
 
 my $CoreBuild = -d "ext" && -f "perl.h" && -d "symbian" && -f "perl.c";
@@ -63,7 +64,6 @@ if ( !defined $SymbianVersion) {
 my ($SYMBIAN_ROOT, $SYMBIAN_VERSION, $SDK_NAME, $SDK_VARIANT, $SDK_VERSION);
 
 if ($CoreBuild) {
-    unshift @INC, "symbian";
     do "sanity.pl" or die $@;
     my %VERSION = %{ do "version.pl" or die $@ };
     ($SYMBIAN_ROOT, $SYMBIAN_VERSION, $SDK_NAME, $SDK_VARIANT, $SDK_VERSION) =