summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--embed.h48
-rw-r--r--global.sym22
-rw-r--r--pod/perlapi.pod38
-rw-r--r--uconfig.h12
4 files changed, 25 insertions, 95 deletions
diff --git a/embed.h b/embed.h
index 560752de2c..273e199a4c 100644
--- a/embed.h
+++ b/embed.h
@@ -1230,30 +1230,6 @@
#define PerlIO_stdout Perl_PerlIO_stdout
#define PerlIO_stderr Perl_PerlIO_stderr
#endif /* PERLIO_LAYERS */
-#if defined(USE_PERLIO) && !defined(USE_SFIO)
-#define PerlIO_close Perl_PerlIO_close
-#define PerlIO_fill Perl_PerlIO_fill
-#define PerlIO_fileno Perl_PerlIO_fileno
-#define PerlIO_eof Perl_PerlIO_eof
-#define PerlIO_error Perl_PerlIO_error
-#define PerlIO_flush Perl_PerlIO_flush
-#define PerlIO_clearerr Perl_PerlIO_clearerr
-#define PerlIO_set_cnt Perl_PerlIO_set_cnt
-#define PerlIO_set_ptrcnt Perl_PerlIO_set_ptrcnt
-#define PerlIO_setlinebuf Perl_PerlIO_setlinebuf
-#define PerlIO_read Perl_PerlIO_read
-#define PerlIO_write Perl_PerlIO_write
-#define PerlIO_unread Perl_PerlIO_unread
-#define PerlIO_tell Perl_PerlIO_tell
-#define PerlIO_seek Perl_PerlIO_seek
-#define PerlIO_get_base Perl_PerlIO_get_base
-#define PerlIO_get_ptr Perl_PerlIO_get_ptr
-#define PerlIO_get_bufsiz Perl_PerlIO_get_bufsiz
-#define PerlIO_get_cnt Perl_PerlIO_get_cnt
-#define PerlIO_stdin Perl_PerlIO_stdin
-#define PerlIO_stdout Perl_PerlIO_stdout
-#define PerlIO_stderr Perl_PerlIO_stderr
-#endif /* PERLIO_LAYERS */
#define ck_anoncode Perl_ck_anoncode
#define ck_bitop Perl_ck_bitop
#define ck_concat Perl_ck_concat
@@ -2795,30 +2771,6 @@
#define PerlIO_stdout() Perl_PerlIO_stdout(aTHX)
#define PerlIO_stderr() Perl_PerlIO_stderr(aTHX)
#endif /* PERLIO_LAYERS */
-#if defined(USE_PERLIO) && !defined(USE_SFIO)
-#define PerlIO_close(a) Perl_PerlIO_close(aTHX_ a)
-#define PerlIO_fill(a) Perl_PerlIO_fill(aTHX_ a)
-#define PerlIO_fileno(a) Perl_PerlIO_fileno(aTHX_ a)
-#define PerlIO_eof(a) Perl_PerlIO_eof(aTHX_ a)
-#define PerlIO_error(a) Perl_PerlIO_error(aTHX_ a)
-#define PerlIO_flush(a) Perl_PerlIO_flush(aTHX_ a)
-#define PerlIO_clearerr(a) Perl_PerlIO_clearerr(aTHX_ a)
-#define PerlIO_set_cnt(a,b) Perl_PerlIO_set_cnt(aTHX_ a,b)
-#define PerlIO_set_ptrcnt(a,b,c) Perl_PerlIO_set_ptrcnt(aTHX_ a,b,c)
-#define PerlIO_setlinebuf(a) Perl_PerlIO_setlinebuf(aTHX_ a)
-#define PerlIO_read(a,b,c) Perl_PerlIO_read(aTHX_ a,b,c)
-#define PerlIO_write(a,b,c) Perl_PerlIO_write(aTHX_ a,b,c)
-#define PerlIO_unread(a,b,c) Perl_PerlIO_unread(aTHX_ a,b,c)
-#define PerlIO_tell(a) Perl_PerlIO_tell(aTHX_ a)
-#define PerlIO_seek(a,b,c) Perl_PerlIO_seek(aTHX_ a,b,c)
-#define PerlIO_get_base(a) Perl_PerlIO_get_base(aTHX_ a)
-#define PerlIO_get_ptr(a) Perl_PerlIO_get_ptr(aTHX_ a)
-#define PerlIO_get_bufsiz(a) Perl_PerlIO_get_bufsiz(aTHX_ a)
-#define PerlIO_get_cnt(a) Perl_PerlIO_get_cnt(aTHX_ a)
-#define PerlIO_stdin() Perl_PerlIO_stdin(aTHX)
-#define PerlIO_stdout() Perl_PerlIO_stdout(aTHX)
-#define PerlIO_stderr() Perl_PerlIO_stderr(aTHX)
-#endif /* PERLIO_LAYERS */
#define ck_anoncode(a) Perl_ck_anoncode(aTHX_ a)
#define ck_bitop(a) Perl_ck_bitop(aTHX_ a)
#define ck_concat(a) Perl_ck_concat(aTHX_ a)
diff --git a/global.sym b/global.sym
index fc51928cc5..4710ebb225 100644
--- a/global.sym
+++ b/global.sym
@@ -627,25 +627,3 @@ Perl_PerlIO_get_cnt
Perl_PerlIO_stdin
Perl_PerlIO_stdout
Perl_PerlIO_stderr
-Perl_PerlIO_close
-Perl_PerlIO_fill
-Perl_PerlIO_fileno
-Perl_PerlIO_eof
-Perl_PerlIO_error
-Perl_PerlIO_flush
-Perl_PerlIO_clearerr
-Perl_PerlIO_set_cnt
-Perl_PerlIO_set_ptrcnt
-Perl_PerlIO_setlinebuf
-Perl_PerlIO_read
-Perl_PerlIO_write
-Perl_PerlIO_unread
-Perl_PerlIO_tell
-Perl_PerlIO_seek
-Perl_PerlIO_get_base
-Perl_PerlIO_get_ptr
-Perl_PerlIO_get_bufsiz
-Perl_PerlIO_get_cnt
-Perl_PerlIO_stdin
-Perl_PerlIO_stdout
-Perl_PerlIO_stderr
diff --git a/pod/perlapi.pod b/pod/perlapi.pod
index af2794bbb7..847bc77f63 100644
--- a/pod/perlapi.pod
+++ b/pod/perlapi.pod
@@ -1440,17 +1440,6 @@ SV is B<not> incremented.
=for hackers
Found in file sv.c
-=item newSV
-
-Create a new null SV, or if len > 0, create a new empty SVt_PV type SV
-with an initial PV allocation of len+1. Normally accessed via the C<NEWSV>
-macro.
-
- SV* newSV(STRLEN len)
-
-=for hackers
-Found in file sv.c
-
=item NEWSV
Creates a new SV. A non-zero C<len> parameter indicates the number of
@@ -1464,6 +1453,17 @@ C<id> is an integer id between 0 and 1299 (used to identify leaks).
=for hackers
Found in file handy.h
+=item newSV
+
+Create a new null SV, or if len > 0, create a new empty SVt_PV type SV
+with an initial PV allocation of len+1. Normally accessed via the C<NEWSV>
+macro.
+
+ SV* newSV(STRLEN len)
+
+=for hackers
+Found in file sv.c
+
=item newSViv
Creates a new SV and copies an integer into it. The reference count for the
@@ -3016,22 +3016,22 @@ for a version which guarantees to evaluate sv only once.
=for hackers
Found in file sv.h
-=item SvUVX
+=item SvUVx
-Returns the raw value in the SV's UV slot, without checks or conversions.
-Only use when you are sure SvIOK is true. See also C<SvUV()>.
+Coerces the given SV to an unsigned integer and returns it. Guarantees to
+evaluate sv only once. Use the more efficient C<SvUV> otherwise.
- UV SvUVX(SV* sv)
+ UV SvUVx(SV* sv)
=for hackers
Found in file sv.h
-=item SvUVx
+=item SvUVX
-Coerces the given SV to an unsigned integer and returns it. Guarantees to
-evaluate sv only once. Use the more efficient C<SvUV> otherwise.
+Returns the raw value in the SV's UV slot, without checks or conversions.
+Only use when you are sure SvIOK is true. See also C<SvUV()>.
- UV SvUVx(SV* sv)
+ UV SvUVX(SV* sv)
=for hackers
Found in file sv.h
diff --git a/uconfig.h b/uconfig.h
index 4332e4ce44..1c3025ae70 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -88,12 +88,6 @@
#define const
#endif
-/* HAS_CRYPT:
- * This symbol, if defined, indicates that the crypt routine is available
- * to encrypt passwords and the like.
- */
-/*#define HAS_CRYPT / **/
-
/* HAS_CUSERID:
* This symbol, if defined, indicates that the cuserid routine is
* available to get character login names.
@@ -3400,6 +3394,12 @@
#define PERL_XS_APIVERSION "5.005"
#define PERL_PM_APIVERSION "5.005"
+/* HAS_CRYPT:
+ * This symbol, if defined, indicates that the crypt routine is available
+ * to encrypt passwords and the like.
+ */
+/*#define HAS_CRYPT / **/
+
/* SETUID_SCRIPTS_ARE_SECURE_NOW:
* This symbol, if defined, indicates that the bug that prevents
* setuid scripts from being secure is not present in this kernel.