From fe1f41416ade6ce8f650b34fd0c7cec1d97c7328 Mon Sep 17 00:00:00 2001 From: ripley Date: Sat, 7 Sep 2024 08:38:36 +0000 Subject: [PATCH] avoid compiler warningsrc/modules/internet/libcurl.c git-svn-id: https://svn.r-project.org/R/trunk@87104 00db46b3-68df-0310-9c12-caf00c1e9a41 --- src/include/Defn.h | 1 + src/include/R_ext/RS.h | 3 ++- src/main/Rdynload.c | 2 ++ src/modules/internet/libcurl.c | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/include/Defn.h b/src/include/Defn.h index 6890fc6967..198cde9115 100644 --- a/src/include/Defn.h +++ b/src/include/Defn.h @@ -897,6 +897,7 @@ extern void R_WaitEvent(void); # define FILESEP "/" #endif /* Win32 */ +/* A minimal version of F77_SUB from RS.h */ #ifdef HAVE_F77_UNDERSCORE # define F77_SYMBOL(x) x ## _ # define F77_QSYMBOL(x) #x "_" diff --git a/src/include/R_ext/RS.h b/src/include/R_ext/RS.h index e001e92ce1..e4656b0db8 100644 --- a/src/include/R_ext/RS.h +++ b/src/include/R_ext/RS.h @@ -88,7 +88,8 @@ extern void R_chk_free(void *); external names containing an underscore. but that is not used here (and none of gfortran, flang-new nor - x86_64 ifx do so: earlier Intel x86 compilere might have). + x86_64 ifx do so: earlier Intel x86 compilere might have). It is + used in Rdynload.c to support .Fortran. */ #ifdef HAVE_F77_UNDERSCORE diff --git a/src/main/Rdynload.c b/src/main/Rdynload.c index 4b5e0fea6e..d76c008c64 100644 --- a/src/main/Rdynload.c +++ b/src/main/Rdynload.c @@ -1107,6 +1107,8 @@ R_dlsym(DllInfo *info, char const *name, snprintf(buf, len, "_%s", name); #endif +/* HAVE_F77_EXTRA_UNDERSCORE is only use here and not in F77_NAME etc. + It seems of only historical interest */ #ifdef HAVE_F77_UNDERSCORE if(symbol && symbol->type == R_FORTRAN_SYM) { strcat(buf, "_"); diff --git a/src/modules/internet/libcurl.c b/src/modules/internet/libcurl.c index d8c6cbba03..57ff56e9c2 100644 --- a/src/modules/internet/libcurl.c +++ b/src/modules/internet/libcurl.c @@ -753,7 +753,7 @@ static void download_close_finished(download_cleanup_info *c) /* compute URL index */ int *url_errs = NULL; curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &url_errs); - int i = url_errs - c->errs; + int i = (int)(url_errs - c->errs); if (msg->data.result != CURLE_OK) download_report_url_error(msg);