diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2002-05-30 19:40:14 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2002-05-30 19:40:14 +0000 |
| commit | 0c8c7b4b6ab716edc54679c28b886fa23068633a (patch) | |
| tree | 68d0fb627bec980f783d5d8c7747dee24d6a02f9 /ext/Devel/PPPort | |
| parent | 49fd6f174cecc7d6d15cd3869e9d2c55c82c2a67 (diff) | |
| download | perl-0c8c7b4b6ab716edc54679c28b886fa23068633a.tar.gz | |
INT2PTR/PTR2IV defined twice.
p4raw-id: //depot/perl@16900
Diffstat (limited to 'ext/Devel/PPPort')
| -rw-r--r-- | ext/Devel/PPPort/PPPort.pm | 76 |
1 files changed, 34 insertions, 42 deletions
diff --git a/ext/Devel/PPPort/PPPort.pm b/ext/Devel/PPPort/PPPort.pm index ea3bdc2510..1b4d585385 100644 --- a/ext/Devel/PPPort/PPPort.pm +++ b/ext/Devel/PPPort/PPPort.pm @@ -434,14 +434,44 @@ __DATA__ # define aTHX_ #endif -#ifndef PTR2IV -# define PTR2IV(d) (IV)(d) +#ifndef UVSIZE +# define UVSIZE IVSIZE #endif - + +#ifndef NVTYPE +# if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE) +# define NVTYPE long double +# else +# define NVTYPE double +# endif +typedef NVTYPE NV; +#endif + #ifndef INT2PTR -# define INT2PTR(any,d) (any)(d) + +#if (IVSIZE == PTRSIZE) && (UVSIZE == PTRSIZE) +# define PTRV UV +# define INT2PTR(any,d) (any)(d) +#else +# if PTRSIZE == LONGSIZE +# define PTRV unsigned long +# else +# define PTRV unsigned +# endif +# define INT2PTR(any,d) (any)(PTRV)(d) +#endif +#define NUM2PTR(any,d) (any)(PTRV)(d) +#define PTR2IV(p) INT2PTR(IV,p) +#define PTR2UV(p) INT2PTR(UV,p) +#define PTR2NV(p) NUM2PTR(NV,p) +#if PTRSIZE == LONGSIZE +# define PTR2ul(p) (unsigned long)(p) +#else +# define PTR2ul(p) INT2PTR(unsigned long,p) #endif +#endif /* !INT2PTR */ + #ifndef boolSV # define boolSV(b) ((b) ? &PL_sv_yes : &PL_sv_no) #endif @@ -668,44 +698,6 @@ SV *sv; # endif #endif -#ifndef UVSIZE -# define UVSIZE IVSIZE -#endif - -#ifndef NVTYPE -# if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE) -# define NVTYPE long double -# else -# define NVTYPE double -# endif -typedef NVTYPE NV; -#endif - -#ifndef INT2PTR - -#if (IVSIZE == PTRSIZE) && (UVSIZE == PTRSIZE) -# define PTRV UV -# define INT2PTR(any,d) (any)(d) -#else -# if PTRSIZE == LONGSIZE -# define PTRV unsigned long -# else -# define PTRV unsigned -# endif -# define INT2PTR(any,d) (any)(PTRV)(d) -#endif -#define NUM2PTR(any,d) (any)(PTRV)(d) -#define PTR2IV(p) INT2PTR(IV,p) -#define PTR2UV(p) INT2PTR(UV,p) -#define PTR2NV(p) NUM2PTR(NV,p) -#if PTRSIZE == LONGSIZE -# define PTR2ul(p) (unsigned long)(p) -#else -# define PTR2ul(p) INT2PTR(unsigned long,p) -#endif - -#endif /* !INT2PTR */ - #ifndef AvFILLp /* Older perls (<=5.003) lack AvFILLp */ # define AvFILLp AvFILL #endif |