Skip to content

Commit f165c3c

Browse files
author
maechler
committed
again : enable R_NO_REMAP_RMATH and calling Rf_*()
git-svn-id: https://svn.r-project.org/R/trunk@87511 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent e6452c4 commit f165c3c

File tree

1 file changed

+158
-7
lines changed

1 file changed

+158
-7
lines changed

src/include/Rmath.h0.in

Lines changed: 158 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- C -*-
22
* Mathlib : A C Library of Special Functions
3-
* Copyright (C) 1998-2024 The R Core Team
3+
* Copyright (C) 1998-2025 The R Core Team
44
* Copyright (C) 2004 The R Foundation
55
*
66
* This program is free software; you can redistribute it and/or modify
@@ -200,7 +200,7 @@ double Rlog1p(double);
200200
#endif
201201

202202

203-
#if !defined(MATHLIB_STANDALONE) && !defined(R_NO_REMAP_RMATH)
203+
#if !defined(MATHLIB_STANDALONE)
204204
#define bessel_i Rf_bessel_i
205205
#define bessel_j Rf_bessel_j
206206
#define bessel_k Rf_bessel_k
@@ -345,11 +345,11 @@ double Rlog1p(double);
345345
#define sign Rf_sign
346346
#define tetragamma Rf_tetragamma
347347
#define trigamma Rf_trigamma
348-
#endif
349348

350-
#define dnorm dnorm4
351-
#define pnorm pnorm5
352-
#define qnorm qnorm5
349+
#define dnorm Rf_dnorm4
350+
#define pnorm Rf_pnorm5
351+
#define qnorm Rf_qnorm5
352+
#endif /* not ..STANDALONE */
353353

354354
#ifdef __cplusplus
355355
extern "C" {
@@ -620,6 +620,157 @@ double tanpi(double);
620620
#endif
621621
double Rtanpi(double); /* our own in any case */
622622

623+
#if !defined(MATHLIB_STANDALONE) && defined(R_NO_REMAP_RMATH)
624+
#undef bessel_i
625+
#undef bessel_j
626+
#undef bessel_k
627+
#undef bessel_y
628+
#undef bessel_i_ex
629+
#undef bessel_j_ex
630+
#undef bessel_k_ex
631+
#undef bessel_y_ex
632+
#undef beta
633+
#undef choose
634+
#undef dbeta
635+
#undef dbinom
636+
#undef dbinom_raw
637+
#undef dcauchy
638+
#undef dchisq
639+
#undef dexp
640+
#undef df
641+
#undef dgamma
642+
#undef dgeom
643+
#undef dhyper
644+
#undef digamma
645+
#undef dlnorm
646+
#undef dlogis
647+
#undef dnbeta
648+
#undef dnbinom
649+
#undef dnbinom_mu
650+
#undef dnchisq
651+
#undef dnf
652+
#undef dnorm4
653+
#undef dnt
654+
#undef dpois_raw
655+
#undef dpois
656+
#undef dpsifn
657+
#undef dsignrank
658+
#undef dt
659+
#undef dtukey
660+
#undef dunif
661+
#undef dweibull
662+
#undef dwilcox
663+
#undef fmax2
664+
#undef fmin2
665+
#undef fprec
666+
#undef fround
667+
#undef ftrunc
668+
#undef fsign
669+
#undef gammafn
670+
#undef imax2
671+
#undef imin2
672+
#undef lbeta
673+
#undef lchoose
674+
#undef lgammafn
675+
#undef lgammafn_sign
676+
#undef lgamma1p
677+
#undef pow1p
678+
#undef log1mexp
679+
#undef log1pexp
680+
#undef log1pmx
681+
#undef logspace_add
682+
#undef logspace_sub
683+
#undef logspace_sum
684+
#undef pbeta
685+
#undef pbeta_raw
686+
#undef pbinom
687+
#undef pcauchy
688+
#undef pchisq
689+
#undef pentagamma
690+
#undef pexp
691+
#undef pf
692+
#undef pgamma
693+
#undef pgeom
694+
#undef phyper
695+
#undef plnorm
696+
#undef plogis
697+
#undef pnbeta
698+
#undef pnbinom
699+
#undef pnbinom_mu
700+
#undef pnchisq
701+
#undef pnf
702+
#undef pnorm5
703+
#undef pnorm_both
704+
#undef pnt
705+
#undef ppois
706+
#undef psignrank
707+
#undef psigamma
708+
#undef pt
709+
#undef ptukey
710+
#undef punif
711+
#undef pweibull
712+
#undef pwilcox
713+
#undef qbeta
714+
#undef qbinom
715+
#undef qcauchy
716+
#undef qchisq
717+
#undef qchisq_appr
718+
#undef qexp
719+
#undef qf
720+
#undef qgamma
721+
#undef qgeom
722+
#undef qhyper
723+
#undef qlnorm
724+
#undef qlogis
725+
#undef qnbeta
726+
#undef qnbinom
727+
#undef qnbinom_mu
728+
#undef qnchisq
729+
#undef qnf
730+
#undef qnorm5
731+
#undef qnt
732+
#undef qpois
733+
#undef qsignrank
734+
#undef qt
735+
#undef qtukey
736+
#undef qunif
737+
#undef qweibull
738+
#undef qwilcox
739+
#undef rbeta
740+
#undef rbinom
741+
#undef rcauchy
742+
#undef rchisq
743+
#undef rexp
744+
#undef rf
745+
#undef rgamma
746+
#undef rgeom
747+
#undef rhyper
748+
#undef rlnorm
749+
#undef rlogis
750+
#undef rmultinom
751+
#undef rnbeta
752+
#undef rnbinom
753+
#undef rnbinom_mu
754+
#undef rnchisq
755+
#undef rnf
756+
#undef rnorm
757+
#undef rnt
758+
#undef rpois
759+
#undef rsignrank
760+
#undef rt
761+
#undef rtukey
762+
#undef runif
763+
#undef rweibull
764+
#undef rwilcox
765+
#undef sign
766+
#undef tetragamma
767+
#undef trigamma
768+
769+
#undef dnorm
770+
#undef pnorm
771+
#undef qnorm
772+
#endif /* not STANDALONE *and* R_NO_REMAP_RMATH */
773+
623774
/* ----------------- Private part of the header file ------------------- */
624775

625776
#if defined(MATHLIB_STANDALONE) && !defined(MATHLIB_PRIVATE_H)
@@ -652,7 +803,7 @@ R_EXTERN int N01_kind;
652803
extern int N01_kind;
653804
# endif
654805

655-
#endif /* MATHLIB_STANDALONE */
806+
#endif /* MATHLIB_STANDALONE and not PRIVATE_H */
656807

657808
#ifdef __cplusplus
658809
}

0 commit comments

Comments
 (0)