To: vim_dev@googlegroups.com
Subject: Patch 8.2.5135
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.5135
Problem:    Running configure gives warnings for main() return type.
Solution:   Specify "int" return type.  Avoid a few more warnings.
Files:      src/configure.ac, src/auto/configure


*** ../vim-8.2.5134/src/configure.ac	2022-06-19 17:05:43.837167030 +0100
--- src/configure.ac	2022-06-19 17:59:27.812578435 +0100
***************
*** 1695,1701 ****
       * Only the first python version used will be switched on.
       */
  
!     int no_rtl_global_needed_for(char *python_instsoname, char *prefix)
      {
        int needed = 0;
        void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
--- 1695,1701 ----
       * Only the first python version used will be switched on.
       */
  
!     static int no_rtl_global_needed_for(char *python_instsoname, char *prefix)
      {
        int needed = 0;
        void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
***************
*** 1714,1720 ****
        return !needed;
      }
  
!     int main(int argc, char** argv)
      {
        int not_needed = 0;
        if (no_rtl_global_needed_for("${vi_cv_dll_name_python}", "${vi_cv_path_python_pfx}"))
--- 1714,1720 ----
        return !needed;
      }
  
!     int main()
      {
        int not_needed = 0;
        if (no_rtl_global_needed_for("${vi_cv_dll_name_python}", "${vi_cv_path_python_pfx}"))
***************
*** 1741,1747 ****
       * Only the first python version used will be switched on.
       */
  
!     int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)
      {
        int needed = 0;
        void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
--- 1741,1747 ----
       * Only the first python version used will be switched on.
       */
  
!     static int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)
      {
        int needed = 0;
        void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
***************
*** 1760,1766 ****
        return !needed;
      }
  
!     int main(int argc, char** argv)
      {
        int not_needed = 0;
        if (no_rtl_global_needed_for("${vi_cv_dll_name_python3}", L"${vi_cv_path_python3_pfx}"))
--- 1760,1766 ----
        return !needed;
      }
  
!     int main()
      {
        int not_needed = 0;
        if (no_rtl_global_needed_for("${vi_cv_dll_name_python3}", L"${vi_cv_path_python3_pfx}"))
***************
*** 2420,2426 ****
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! 		main()
  		{
  		  if (sizeof(wchar_t) <= 2)
  		    exit(1);
--- 2420,2426 ----
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! 		int main()
  		{
  		  if (sizeof(wchar_t) <= 2)
  		    exit(1);
***************
*** 3218,3224 ****
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }
    ]])],[
      vim_cv_toupper_broken=yes
    ],[
--- 3218,3224 ----
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! int main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }
    ]])],[
      vim_cv_toupper_broken=yes
    ],[
***************
*** 3442,3448 ****
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }])],
  			  res="OK", res="FAIL", res="FAIL")
        if test "$res" = "OK"; then
  	break
--- 3442,3448 ----
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! int main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }])],
  			  res="OK", res="FAIL", res="FAIL")
        if test "$res" = "OK"; then
  	break
***************
*** 3481,3487 ****
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! main()
  {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }
      ]])],[
        vim_cv_terminfo=no
--- 3481,3487 ----
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! int main()
  {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }
      ]])],[
        vim_cv_terminfo=no
***************
*** 3507,3513 ****
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! main()
  {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }
      ]])],[
        vim_cv_tgetent=zero
--- 3507,3513 ----
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! int main()
  {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }
      ]])],[
        vim_cv_tgetent=zero
***************
*** 3670,3676 ****
  #include <unistd.h>
  #endif
  char *dagger[] = { "IFS=pwd", 0 };
! main()
  {
    char buffer[500];
    extern char **environ;
--- 3670,3676 ----
  #include <unistd.h>
  #endif
  char *dagger[] = { "IFS=pwd", 0 };
! int main()
  {
    char buffer[500];
    extern char **environ;
***************
*** 3849,3855 ****
  #endif
  #include <sys/types.h>
  #include <sys/stat.h>
! main() {struct stat st;  exit(stat("configure/", &st) != 0); }
      ]])],[
        vim_cv_stat_ignores_slash=yes
      ],[
--- 3849,3855 ----
  #endif
  #include <sys/types.h>
  #include <sys/stat.h>
! int main() {struct stat st;  exit(stat("configure/", &st) != 0); }
      ]])],[
        vim_cv_stat_ignores_slash=yes
      ],[
***************
*** 4238,4244 ****
  #ifdef HAVE_INTTYPES_H
  # include <inttypes.h>
  #endif
! main() {
    uint32_t nr1 = (uint32_t)-1;
    uint32_t nr2 = (uint32_t)0xffffffffUL;
    if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) return 1;
--- 4238,4244 ----
  #ifdef HAVE_INTTYPES_H
  # include <inttypes.h>
  #endif
! int main() {
    uint32_t nr1 = (uint32_t)-1;
    uint32_t nr2 = (uint32_t)0xffffffffUL;
    if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) return 1;
***************
*** 4260,4266 ****
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! main() {
    char buf[10];
    strcpy(buf, "abcdefghi");
    mch_memmove(buf, buf + 2, 3);
--- 4260,4266 ----
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! int main() {
    char buf[10];
    strcpy(buf, "abcdefghi");
    mch_memmove(buf, buf + 2, 3);
*** ../vim-8.2.5134/src/auto/configure	2022-06-19 17:05:43.837167030 +0100
--- src/auto/configure	2022-06-19 17:59:32.920572279 +0100
***************
*** 7013,7019 ****
       * Only the first python version used will be switched on.
       */
  
!     int no_rtl_global_needed_for(char *python_instsoname, char *prefix)
      {
        int needed = 0;
        void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
--- 7013,7019 ----
       * Only the first python version used will be switched on.
       */
  
!     static int no_rtl_global_needed_for(char *python_instsoname, char *prefix)
      {
        int needed = 0;
        void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
***************
*** 7032,7038 ****
        return !needed;
      }
  
!     int main(int argc, char** argv)
      {
        int not_needed = 0;
        if (no_rtl_global_needed_for("${vi_cv_dll_name_python}", "${vi_cv_path_python_pfx}"))
--- 7032,7038 ----
        return !needed;
      }
  
!     int main()
      {
        int not_needed = 0;
        if (no_rtl_global_needed_for("${vi_cv_dll_name_python}", "${vi_cv_path_python_pfx}"))
***************
*** 7079,7085 ****
       * Only the first python version used will be switched on.
       */
  
!     int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)
      {
        int needed = 0;
        void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
--- 7079,7085 ----
       * Only the first python version used will be switched on.
       */
  
!     static int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)
      {
        int needed = 0;
        void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
***************
*** 7098,7104 ****
        return !needed;
      }
  
!     int main(int argc, char** argv)
      {
        int not_needed = 0;
        if (no_rtl_global_needed_for("${vi_cv_dll_name_python3}", L"${vi_cv_path_python3_pfx}"))
--- 7098,7104 ----
        return !needed;
      }
  
!     int main()
      {
        int not_needed = 0;
        if (no_rtl_global_needed_for("${vi_cv_dll_name_python3}", L"${vi_cv_path_python3_pfx}"))
***************
*** 9209,9215 ****
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! 		main()
  		{
  		  if (sizeof(wchar_t) <= 2)
  		    exit(1);
--- 9209,9215 ----
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! 		int main()
  		{
  		  if (sizeof(wchar_t) <= 2)
  		    exit(1);
***************
*** 10751,10757 ****
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }
  
  _ACEOF
  if ac_fn_c_try_run "$LINENO"; then :
--- 10751,10757 ----
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! int main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }
  
  _ACEOF
  if ac_fn_c_try_run "$LINENO"; then :
***************
*** 11973,11979 ****
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }
  _ACEOF
  if ac_fn_c_try_run "$LINENO"; then :
    res="OK"
--- 11973,11979 ----
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! int main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }
  _ACEOF
  if ac_fn_c_try_run "$LINENO"; then :
    res="OK"
***************
*** 12050,12056 ****
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! main()
  {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }
  
  _ACEOF
--- 12050,12056 ----
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! int main()
  {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }
  
  _ACEOF
***************
*** 12099,12105 ****
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! main()
  {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }
  
  _ACEOF
--- 12099,12105 ----
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! int main()
  {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }
  
  _ACEOF
***************
*** 12464,12470 ****
  #include <unistd.h>
  #endif
  char *dagger[] = { "IFS=pwd", 0 };
! main()
  {
    char buffer[500];
    extern char **environ;
--- 12464,12470 ----
  #include <unistd.h>
  #endif
  char *dagger[] = { "IFS=pwd", 0 };
! int main()
  {
    char buffer[500];
    extern char **environ;
***************
*** 13128,13134 ****
  #endif
  #include <sys/types.h>
  #include <sys/stat.h>
! main() {struct stat st;  exit(stat("configure/", &st) != 0); }
  
  _ACEOF
  if ac_fn_c_try_run "$LINENO"; then :
--- 13128,13134 ----
  #endif
  #include <sys/types.h>
  #include <sys/stat.h>
! int main() {struct stat st;  exit(stat("configure/", &st) != 0); }
  
  _ACEOF
  if ac_fn_c_try_run "$LINENO"; then :
***************
*** 14282,14288 ****
  #ifdef HAVE_INTTYPES_H
  # include <inttypes.h>
  #endif
! main() {
    uint32_t nr1 = (uint32_t)-1;
    uint32_t nr2 = (uint32_t)0xffffffffUL;
    if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) return 1;
--- 14282,14288 ----
  #ifdef HAVE_INTTYPES_H
  # include <inttypes.h>
  #endif
! int main() {
    uint32_t nr1 = (uint32_t)-1;
    uint32_t nr2 = (uint32_t)0xffffffffUL;
    if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) return 1;
***************
*** 14310,14316 ****
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! main() {
    char buf[10];
    strcpy(buf, "abcdefghi");
    mch_memmove(buf, buf + 2, 3);
--- 14310,14316 ----
  # include <stdlib.h>
  # include <stddef.h>
  #endif
! int main() {
    char buf[10];
    strcpy(buf, "abcdefghi");
    mch_memmove(buf, buf + 2, 3);
*** ../vim-8.2.5134/src/version.c	2022-06-19 17:45:22.389700287 +0100
--- src/version.c	2022-06-19 18:01:24.628211847 +0100
***************
*** 736,737 ****
--- 736,739 ----
  {   /* Add new patch number below this line */
+ /**/
+     5135,
  /**/

-- 
ARTHUR: What are you going to do. bleed on me?
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///