summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2005-10-18 19:07:28 +0300
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>2005-10-18 12:48:17 +0000
commit9969cdde14140755eb30d589cbe9cc9376b9fe3d (patch)
tree00a2c0b69c962497b48178b857a64fcb322eb9a3
parent9649b81b974723b45fde1b99b473c7d475db6cbd (diff)
downloadperl-9969cdde14140755eb30d589cbe9cc9376b9fe3d.tar.gz
missed some SYMBIAN ifdefs
Message-ID: <B356D8F434D20B40A8CEDAEC305A1F24E7A64D@esebe105.NOE.Nokia.com> p4raw-id: //depot/perl@25790
-rw-r--r--perl.h12
-rw-r--r--util.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/perl.h b/perl.h
index 7c2a05aa53..fd34ea3044 100644
--- a/perl.h
+++ b/perl.h
@@ -190,7 +190,7 @@
#define CALLREG_INTUIT_STRING CALL_FPTR(PL_regint_string)
#define CALLREGFREE CALL_FPTR(PL_regfree)
-#if defined(SYMBIAN) && defined(__GNUC__)
+#if defined(__SYMBIAN32__) && defined(__GNUC__)
# ifdef __cplusplus
# define PERL_UNUSED_DECL
# else
@@ -385,11 +385,11 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
#define DOSISH 1
#endif
-#if defined(__STDC__) || defined(vax11c) || defined(_AIX) || defined(__stdc__) || defined(__cplusplus) || defined( EPOC) || defined(NETWARE) || defined(SYMBIAN)
+#if defined(__STDC__) || defined(vax11c) || defined(_AIX) || defined(__stdc__) || defined(__cplusplus) || defined(EPOC) || defined(NETWARE) || defined(__SYMBIAN32__)
# define STANDARD_C 1
#endif
-#if defined(__cplusplus) || defined(WIN32) || defined(__sgi) || defined(__EMX__) || defined(__DGUX) || defined( EPOC) || defined(__QNX__) || defined(NETWARE) || defined(PERL_MICRO)
+#if defined(__cplusplus) || defined(WIN32) || defined(__sgi) || defined(__EMX__) || defined(__DGUX) || defined(EPOC) || defined(__QNX__) || defined(NETWARE) || defined(PERL_MICRO)
# define DONT_DECLARE_STD 1
#endif
@@ -547,7 +547,7 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
# include <unistd.h>
#endif
-#ifdef SYMBIAN
+#ifdef __SYMBIAN32__
# undef _SC_ARG_MAX /* Symbian has _SC_ARG_MAX but no sysconf() */
#endif
@@ -833,7 +833,7 @@ int usleep(unsigned int);
# define STRUCT_OFFSET(s,m) (Size_t)(&(((s *)0)->m))
#endif
-#ifndef SYMBIAN
+#ifndef __SYMBIAN32__
# if defined(I_STRING) || defined(__cplusplus)
# include <string.h>
# else
@@ -2312,7 +2312,7 @@ typedef struct clone_params CLONE_PARAMS;
# define ISHISH "epoc"
#endif
-#ifdef SYMBIAN
+#ifdef __SYMBIAN32__
# include "symbian/symbianish.h"
# include "embed.h"
# define ISHISH "symbian"
diff --git a/util.h b/util.h
index 7d373525bf..ff11b78af8 100644
--- a/util.h
+++ b/util.h
@@ -27,7 +27,7 @@
|| ((f)[0] == '\\' && (f)[1] == '\\') /* UNC path */ \
|| ((f)[3] == ':')) /* volume name, currently only sys */
# else /* !NETWARE */
-# if defined( DOSISH) || defined(EPOC) || defined(SYMBIAN)
+# if defined(DOSISH) || defined(EPOC) || defined(__SYMBIAN32__)
# define PERL_FILE_IS_ABSOLUTE(f) \
(*(f) == '/' \
|| ((f)[0] && (f)[1] == ':')) /* drive name */