Use different scheme to handle MSVC6

[perl5.git] / symbian / symbianish.h

diff --git a/symbian/symbianish.h b/symbian/symbianish.h
index 4f06e0a..9100405 100644 (file)
--- 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.
  */
@@ -119,13 +119,16 @@
 #define Fflush(fp)         fflush(fp)
 #define Mkdir(path,mode)   mkdir((path),(mode))
 
-#ifndef PERL_SYS_TERM
-#define PERL_SYS_TERM()                OP_REFCNT_TERM; MALLOC_TERM; CloseSTDLIB();
+#ifndef PERL_SYS_TERM_BODY
+#define PERL_SYS_TERM_BODY()   HINTS_REFCNT_TERM; OP_REFCNT_TERM;          \
+                               PERLIO_TERM; MALLOC_TERM; CloseSTDLIB();    \
+                                PERL_LOCALE_TERM
+
 #endif
 
 #define BIT_BUCKET "NUL:"
 
-#define dXSUB_SYS
+#define dXSUB_SYS dNOOP
 
 #define NO_ENVIRON_ARRAY
 
@@ -141,11 +144,7 @@ pid_t wait(int *status);
 #  define PERL_UNSET_VARS(v) symbian_unset_vars()
 #endif /* #ifdef PERL_GLOBAL_STRUCT_PRIVATE */
 
-#undef PERL_EXPORT_C
-#define PERL_EXPORT_C EXPORT_C /* for perlio.h */
-#define PERL_CALLCONV EXPORT_C /* for prototype.h */
-#undef PERL_XS_EXPORT_C
-#define PERL_XS_EXPORT_C EXPORT_C
+#define PERL_CALLCONV EXPORT_C /* for proto.h */
 
 #ifndef PERL_CORE
 #define PERL_CORE /* for WINS builds under VC */
@@ -170,7 +169,7 @@ pid_t wait(int *status);
 #define times(b)  symbian_times(b)
 #define usleep(u) symbian_usleep(u)
 
-#define PERL_SYS_INIT(c, v) symbian_sys_init(c, v)
+#define PERL_SYS_INIT_BODY(c, v) symbian_sys_init(c, v)
 
 #ifdef __SERIES60_1X__
 #  error "Unfortunately Perl does not work in S60 1.2 (see FAQ-0929)"