diff options
| author | markm <markm@FreeBSD.org> | 2000-06-25 20:12:58 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2000-06-25 20:12:58 +0000 |
| commit | a163dbcae6308424dd16f41b17df541518924b88 (patch) | |
| tree | 93d5a230bdf320169079a76ca0bf8aa5cbedaab2 /contrib/perl5 | |
| parent | 3666dff9fff3e55d53ffa93f0e21298a2495e567 (diff) | |
| download | FreeBSD-src-a163dbcae6308424dd16f41b17df541518924b88.zip FreeBSD-src-a163dbcae6308424dd16f41b17df541518924b88.tar.gz | |
Grr..
Fix FUBARred conflict-merge. This fixes "make world".
Diffstat (limited to 'contrib/perl5')
| -rw-r--r-- | contrib/perl5/perl.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/contrib/perl5/perl.h b/contrib/perl5/perl.h index 831bc55..9538e28 100644 --- a/contrib/perl5/perl.h +++ b/contrib/perl5/perl.h @@ -2198,14 +2198,6 @@ typedef Sighandler_t Sigsave_t; typedef int (CPERLscope(*runops_proc_t)) (pTHX); typedef OP* (CPERLscope(*PPADDR_t)[]) (pTHX); -#ifndef PERL_OBJECT -typedef int runops_proc_t _((void)); -int runops_standard _((void)); -#ifdef DEBUGGING -int runops_debug _((void)); -#endif -#endif /* PERL_OBJECT */ - /* _ (for $_) must be first in the following list (DEFSV requires it) */ #define THREADSV_NAMES "_123456789&`'+/.,\\\";^-%=|~:\001\005!@" @@ -2605,8 +2597,6 @@ typedef void (*XSINIT_t) (pTHXo); typedef void (*ATEXIT_t) (pTHXo_ void*); typedef void (*XSUBADDR_t) (pTHXo_ CV *); -#endif - /* Set up PERLVAR macros for populating structs */ #define PERLVAR(var,type) type var; #define PERLVARA(var,n,type) type var[n]; @@ -2736,10 +2726,6 @@ typedef void *Thread; #define PERLVARI(var,type,init) EXT type PL_##var INIT(init); #define PERLVARIC(var,type,init) EXTCONST type PL_##var INIT(init); -#ifndef PERL_GLOBAL_STRUCT -#include "perlvars.h" -#endif - #if !defined(MULTIPLICITY) && !defined(PERL_OBJECT) START_EXTERN_C # include "intrpvar.h" |
