Skip to content

Commit dc33181

Browse files
author
ripley
committed
clang-{18,19} in C23 mode requires attributes before return values
git-svn-id: https://svn.r-project.org/R/trunk@87370 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 26387a4 commit dc33181

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/library/graphics/src/graphics.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2603,11 +2603,10 @@ void GLine(double x1, double y1, double x2, double y2, int coords, pGEDevDesc dd
26032603
*/
26042604
static void (*old_close)(pDevDesc) = NULL;
26052605

2606-
static void
26072606
#ifndef WIN32
26082607
NORET
26092608
#endif
2610-
locator_close(pDevDesc dd)
2609+
static void locator_close(pDevDesc dd)
26112610
{
26122611
if(old_close) old_close(dd);
26132612
dd->close = old_close;

src/main/context.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ static RCNTXT *first_jump_target(RCNTXT *cptr, int mask)
212212

213213
/* R_jumpctxt - jump to the named context */
214214

215-
attribute_hidden void NORET R_jumpctxt(RCNTXT * targetcptr, int mask, SEXP val)
215+
attribute_hidden NORET void R_jumpctxt(RCNTXT * targetcptr, int mask, SEXP val)
216216
{
217217
Rboolean savevis = R_Visible;
218218
RCNTXT *cptr;
@@ -334,7 +334,7 @@ void endcontext(RCNTXT * cptr)
334334

335335
/* findcontext - find the correct context */
336336

337-
attribute_hidden void NORET findcontext(int mask, SEXP env, SEXP val)
337+
attribute_hidden NORET void findcontext(int mask, SEXP env, SEXP val)
338338
{
339339
RCNTXT *cptr;
340340
cptr = R_GlobalContext;
@@ -356,7 +356,7 @@ attribute_hidden void NORET findcontext(int mask, SEXP env, SEXP val)
356356
}
357357
}
358358

359-
attribute_hidden void NORET R_JumpToContext(RCNTXT *target, int mask, SEXP val)
359+
attribute_hidden NORET void R_JumpToContext(RCNTXT *target, int mask, SEXP val)
360360
{
361361
RCNTXT *cptr;
362362
for (cptr = R_GlobalContext;

0 commit comments

Comments
 (0)