Skip to content

Commit

Permalink
Purge remaining references to PerlIO_sprintf and PerlIO_vsprintf().
Browse files Browse the repository at this point in the history
Eliminate their function prototypes. Eliminate references in perlio.sym and
makedef.pl which caused them to still be added to the Win32 linker
definitions.
  • Loading branch information
nwc10 committed Oct 7, 2013
1 parent 29b43da commit 5eb9f46
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 12 deletions.
3 changes: 0 additions & 3 deletions makedef.pl
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,6 @@ sub readvar {
PerlIO_set_cnt
PerlIO_set_ptrcnt
PerlIO_setlinebuf
PerlIO_sprintf
PerlIO_stderr
PerlIO_stdin
PerlIO_stdout
Expand Down Expand Up @@ -805,9 +804,7 @@ sub readvar {
PerlIO_getpos
PerlIO_init
PerlIO_setpos
PerlIO_sprintf
PerlIO_tmpfile
PerlIO_vsprintf
));

if ($ARGS{PLATFORM} eq 'win32') {
Expand Down
4 changes: 0 additions & 4 deletions perlio.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,6 @@ PERL_EXPORT_C void PerlIO_setlinebuf(PerlIO *);
PERL_EXPORT_C int PerlIO_printf(PerlIO *, const char *, ...)
__attribute__format__(__printf__, 2, 3);
#endif
#ifndef PerlIO_sprintf
PERL_EXPORT_C int PerlIO_sprintf(char *, int, const char *, ...)
__attribute__format__(__printf__, 3, 4);
#endif
#ifndef PerlIO_vprintf
PERL_EXPORT_C int PerlIO_vprintf(PerlIO *, const char *, va_list);
#endif
Expand Down
2 changes: 0 additions & 2 deletions perlio.sym
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ PerlIO_releaseFILE
PerlIO_reopen
PerlIO_rewind
PerlIO_setpos
PerlIO_sprintf
PerlIO_stdoutf
PerlIO_teardown
PerlIO_tmpfile
PerlIO_ungetc
PerlIO_vprintf
PerlIO_vsprintf
2 changes: 0 additions & 2 deletions perliol.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,6 @@ PERL_EXPORT_C PerlIO_list_t * PerlIO_resolve_layers(pTHX_ const char *layers, co
PERL_EXPORT_C PerlIO_funcs * PerlIO_default_layer(pTHX_ I32 n);
PERL_EXPORT_C PerlIO_list_t * PerlIO_default_layers(pTHX);
PERL_EXPORT_C PerlIO * PerlIO_reopen(const char *path, const char *mode, PerlIO *f);
PERL_EXPORT_C int PerlIO_vsprintf(char *s, int n, const char *fmt, va_list ap)
__attribute__format__(__printf__,3,0);

PERL_EXPORT_C PerlIO_list_t *PerlIO_list_alloc(pTHX);
PERL_EXPORT_C PerlIO_list_t *PerlIO_clone_list(pTHX_ PerlIO_list_t *proto, CLONE_PARAMS *param);
Expand Down
1 change: 0 additions & 1 deletion perlsfio.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ extern int _stdprintf _ARG_((const char*, ...));
#define PerlIO_puts(f,s) sfputr(f,s,-1)
#define PerlIO_putc(f,c) sfputc(f,c)
#define PerlIO_ungetc(f,c) sfungetc(f,c)
#define PerlIO_sprintf sfsprintf
#define PerlIO_getc(f) sfgetc(f)
#define PerlIO_eof(f) sfeof(f)
#define PerlIO_error(f) sferror(f)
Expand Down

0 comments on commit 5eb9f46

Please sign in to comment.