Skip to content

Commit 8870a8e

Browse files
author
luke
committed
Complete removal of R_ext/Callbacks.h and R_ext/PrtUtil.h.
git-svn-id: https://svn.r-project.org/R/trunk@89323 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent eb79f67 commit 8870a8e

File tree

6 files changed

+6
-97
lines changed

6 files changed

+6
-97
lines changed

doc/NEWS.Rd

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -300,13 +300,7 @@
300300
includes directory. The \code{R_ObjectTable} type definitions
301301
formally in \file{R_ext/Callbacks.h} are now available in the new
302302
header file \file{R_ext/ObjectTable.h}. This new header file
303-
should be used in packages instead of \file{R_ext/Callbacks.h}. To
304-
ease the transition, stub files \file{R_ext/Callbacks.h} and
305-
\code{R_ext/PrtUtil.h} have been added. These stub files contain
306-
\code{#warning} directives to signal warnings that these files
307-
should not be used. The stub \file{R_ext/Callbacks.h} also
308-
includes \file{R_ext/ObjectTable.h}. Packages including these headers
309-
will install successfully but with warnings for using these files.
303+
should be used in packages instead of \file{R_ext/Callbacks.h}.
310304

311305
\item New function \code{R_mapAttrib} for iterating over the
312306
attributes of an object.

doc/manual/rw-FAQ.texi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,7 @@ The @command{Rgui.exe} console is a Windows application: writing to
19301930
@code{stdout} or @code{stderr} will not produce output in the
19311931
console. (This will work with @command{Rterm.exe}.) Use @code{Rprintf} or
19321932
@code{REprintf} instead. These are declared in header file
1933-
@file{R_ext/PrtUtil.h}.
1933+
@file{R_ext/Print.h}.
19341934

19351935
Note that output from the console is delayed (@pxref{The output to the
19361936
console seems to be delayed}), so that you will not normally see any

src/include/Makefile.win

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ GW32_HEADERS = iconv.h psignal.h
1717

1818
## This omits GetX11Image.h QuartzDevice.h eventloop.h
1919
R_EXT_HEADERS = \
20-
Altrep.h Applic.h Arith.h BLAS.h Boolean.h Callbacks.h Complex.h \
20+
Altrep.h Applic.h Arith.h BLAS.h Boolean.h Complex.h \
2121
Connections.h Constants.h Error.h \
2222
GraphicsDevice.h GraphicsEngine.h Itermacros.h \
2323
Lapack.h Linpack.h MathThreads.h Memory.h \
24-
Parse.h Print.h PrtUtil.h RS.h Rallocators.h Random.h \
24+
Parse.h Print.h RS.h Rallocators.h Random.h \
2525
Rdynload.h Riconv.h RStartup.h Utils.h libextern.h \
2626
stats_package.h stats_stubs.h Visibility.h ObjectTable.h
2727

src/include/R_ext/Callbacks.h

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/include/R_ext/Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
1616
## API per se.
1717
R_EXT_HEADERS = \
1818
Altrep.h \
19-
Applic.h Arith.h BLAS.h Boolean.h Callbacks.h Complex.h Connections.h \
19+
Applic.h Arith.h BLAS.h Boolean.h Complex.h Connections.h \
2020
Constants.h Error.h GetX11Image.h \
2121
GraphicsDevice.h GraphicsEngine.h Itermacros.h \
2222
Lapack.h Linpack.h MathThreads.h Memory.h QuartzDevice.h \
23-
Parse.h Print.h PrtUtil.h RS.h Rallocators.h Random.h \
23+
Parse.h Print.h RS.h Rallocators.h Random.h \
2424
Rdynload.h Riconv.h RStartup.h Utils.h eventloop.h libextern.h \
2525
stats_package.h stats_stubs.h Visibility.h ObjectTable.h
2626

src/include/R_ext/PrtUtil.h

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)