Skip to content

Commit fdb3194

Browse files
author
ripley
committed
use Rinternals where it suffices
git-svn-id: https://svn.r-project.org/R/trunk@87854 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 3985bc5 commit fdb3194

File tree

9 files changed

+15
-31
lines changed

9 files changed

+15
-31
lines changed

src/library/stats/src/complete_cases.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* R : A Computer Language for Statistical Data Analysis
33
* Copyright (C) 1995, 1996 Robert Gentleman and Ross Ihaka
4-
* Copyright (C) 1997-2023 The R Core Team
4+
* Copyright (C) 1997-2025 The R Core Team
55
*
66
* This program is free software; you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License as published by
@@ -18,11 +18,7 @@
1818
* https://www.R-project.org/Licenses/
1919
*/
2020

21-
#ifdef HAVE_CONFIG_H
22-
#include <config.h>
23-
#endif
24-
25-
#include <Defn.h>
21+
#include <Rinternals.h>
2622
#include "statsErr.h"
2723

2824
#define R_MSG_type _("invalid 'type' (%s) of argument")

src/library/stats/src/cov.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# define SQRTL sqrt
2929
#endif
3030

31-
#include <Defn.h>
31+
#include <Defn.h> // for LDOUBLE
3232
#include <Rmath.h>
3333

3434
#include "statsR.h"

src/library/stats/src/deriv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <config.h>
2727
#endif
2828

29-
#include "Defn.h"
29+
#include <Defn.h> // for deparse1
3030
#include "statsErr.h"
3131

3232
static SEXP ParenSymbol;

src/library/stats/src/distn.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* R : A Computer Language for Statistical Data Analysis
3-
* Copyright (C) 1998--2023 The R Core Team
3+
* Copyright (C) 1998--2025 The R Core Team
44
* Copyright (C) 1995--1997 Robert Gentleman and Ross Ihaka
55
*
66
* This program is free software; you can redistribute it and/or modify
@@ -24,12 +24,7 @@
2424
* ~~~~~~~~~~~~~~~~~~~~~~~~~~
2525
*/
2626

27-
28-
#ifdef HAVE_CONFIG_H
29-
#include <config.h>
30-
#endif
31-
32-
#include <Defn.h>
27+
#include <Rinternals.h>
3328
#include <Rmath.h>
3429
#include "statsR.h"
3530
#include "statsErr.h"

src/library/stats/src/fourier.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* R : A Computer Language for Statistical Data Analysis
3-
* Copyright (C) 1998--2023 The R Core Team
3+
* Copyright (C) 1998--2025 The R Core Team
44
* Copyright (C) 1995--1997 Robert Gentleman and Ross Ihaka
55
*
66
* This program is free software; you can redistribute it and/or modify
@@ -24,11 +24,7 @@
2424
#include <inttypes.h>
2525
// for PRIu64
2626

27-
#ifdef HAVE_CONFIG_H
28-
#include <config.h>
29-
#endif
30-
31-
#include <Defn.h>
27+
#include <Rinternals.h>
3228
#include "statsErr.h"
3329

3430
// workhorse routines from fft.c

src/library/stats/src/model.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* R : A Computer Language for Statistical Data Analysis
3-
* Copyright (C) 1997--2024 The R Core Team
3+
* Copyright (C) 1997--2025 The R Core Team
44
* Copyright (C) 1995, 1996 Robert Gentleman and Ross Ihaka
55
*
66
* This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,7 @@
2222
#include <config.h>
2323
#endif
2424

25+
#include <string.h> // for memset, strcat, strlen, strncmp
2526
#include <Defn.h>
2627

2728
#include "statsR.h"

src/library/stats/src/optim.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* R : A Computer Language for Statistical Data Analysis
3-
* Copyright (C) 1999-2024 The R Core Team
3+
* Copyright (C) 1999-2025 The R Core Team
44
*
55
* This program is free software; you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
2121
#include <config.h>
2222
#endif
2323

24-
#include <Defn.h>
24+
#include <Defn.h> // for ENSURE_NAMEDMAX
2525
#include <R_ext/Applic.h>
2626

2727
#include "statsR.h"

src/library/stats/src/optimize.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#endif
2525

2626
#define NO_NLS
27-
#include <Defn.h>
27+
#include <Defn.h> // for PrintDefaults
2828
#include <float.h> /* for DBL_MAX */
2929
#include <R_ext/Applic.h> /* for optif9, fdhess */
3030
#include <R_ext/RS.h> /* for Memcpy */

src/library/stats/src/random.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* R : A Computer Language for Statistical Data Analysis
3-
* Copyright (C) 1997--2020 The R Core Team
3+
* Copyright (C) 1997--2025 The R Core Team
44
* Copyright (C) 2003--2016 The R Foundation
55
* Copyright (C) 1995, 1996 Robert Gentleman and Ross Ihaka
66
*
@@ -19,11 +19,7 @@
1919
* https://www.R-project.org/Licenses/
2020
*/
2121

22-
#ifdef HAVE_CONFIG_H
23-
# include <config.h>
24-
#endif
25-
26-
#include <Defn.h>
22+
#include <Rinternals.h>
2723
#include <R_ext/Random.h>
2824
#include <Rmath.h> /* for lgammafn, rmultinom */
2925
#include <errno.h>

0 commit comments

Comments
 (0)