Skip to content

Commit 4001fd7

Browse files
author
murrell
committed
add include to make r89084 nicer
git-svn-id: https://svn.r-project.org/R/trunk@89085 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent e38fb5d commit 4001fd7

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

src/main/engine.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,8 @@
3131

3232
# include <rlocale.h>
3333

34-
/*
35-
* Formerly R_ext/GraphicsEngine.h
36-
*/
37-
double R_GE_VStrWidth(const char *s, cetype_t enc, const pGEcontext gc, pGEDevDesc dd);
38-
39-
double R_GE_VStrHeight(const char *s, cetype_t enc, const pGEcontext gc, pGEDevDesc dd);
40-
void R_GE_VText(double x, double y, const char * const s, cetype_t enc,
41-
double x_justify, double y_justify, double rotation,
42-
const pGEcontext gc, pGEDevDesc dd);
43-
/*
44-
* (End from R_ext/GraphicsEngine.h)
45-
*/
34+
/* Hershey functions */
35+
#include "g_extern.h"
4636

4737
int R_GE_getVersion(void)
4838
{

src/main/g_extern.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,17 @@ extern const struct plTypefaceInfoStruct _hershey_typeface_info[];
135135
extern unsigned short * _controlify (pGEDevDesc, const unsigned char *,
136136
int, int);
137137

138+
/* PAUL MURRELL
139+
Used by engine.c
140+
*/
141+
extern double R_GE_VStrWidth(const char *s, cetype_t enc,
142+
const pGEcontext gc, pGEDevDesc dd);
143+
extern double R_GE_VStrHeight(const char *s, cetype_t enc,
144+
const pGEcontext gc, pGEDevDesc dd);
145+
extern void R_GE_VText(double x, double y, const char * const s, cetype_t enc,
146+
double x_justify, double y_justify, double rotation,
147+
const pGEcontext gc, pGEDevDesc dd);
148+
138149
/* PAUL MURRELL
139150
Removed heaps below here
140151
*/

0 commit comments

Comments
 (0)