Loading ...
Sorry, an error occurred while loading the content.

2303Re: Solution for the problem of gvimext in UTF-8 locale

Expand Messages
  • MURAOKA Taro
    Jul 29, 2007
      Vim loads libintl.dll dynamically, so we can try multiple
      implementations of libintl.dll easily.

      In attached patch, it try to load libintl2.dll (which requres
      libiconv.dll too) first, when it was failed, try to load libintl.dll
      (not require libiconv.dll). After applied this patch, we would
      distribute libintl2.dll and libiconv.dll separately from vim as an
      "option".
      --
      MURAOKA Taro <KoRoN.KaoriYa@...>


      diff -c ./src/os_win32.c.orig ./src/os_win32.c
      *** ./src/os_win32.c.orig Mon Jul 30 06:04:40 2007
      --- ./src/os_win32.c Mon Jul 30 06:15:57 2007
      ***************
      *** 248,253 ****
      --- 248,256 ----
      }

      #if defined(DYNAMIC_GETTEXT) || defined(PROTO)
      + # ifndef GETTEXT_DLL_WITHENC
      + # define GETTEXT_DLL_WITHENC "libintl2.dll"
      + # endif
      # ifndef GETTEXT_DLL
      # define GETTEXT_DLL "libintl.dll"
      # endif
      ***************
      *** 285,291 ****
      if (hLibintlDLL)
      return 1;
      /* Load gettext library (libintl.dll) */
      ! hLibintlDLL = LoadLibrary(libname != NULL ? libname :
      GETTEXT_DLL);
      if (!hLibintlDLL)
      {
      char_u dirname[_MAX_PATH];
      --- 288,311 ----
      if (hLibintlDLL)
      return 1;
      /* Load gettext library (libintl.dll) */
      ! /*
      ! * Priority:
      ! * 1. libname if it isn't NULL.
      ! * 2. GETTEXT_DLL_WITHENC to convert encodings.
      ! * 3. GETTEXT_DLL to use message in only native encoding.
      ! */
      ! if (libname != NULL)
      ! {
      ! hLibintlDLL = LoadLibrary(libname);
      ! /* If failed to load libname, try to load default libraries. */
      ! }
      ! if (hLibintlDLL == NULL)
      ! {
      ! hLibintlDLL = LoadLibrary(GETTEXT_DLL_WITHENC);
      ! if (hLibintlDLL == NULL)
      ! hLibintlDLL = LoadLibrary(GETTEXT_DLL);
      ! }
      ! /* Get functions of gettext library. */
      if (!hLibintlDLL)
      {
      char_u dirname[_MAX_PATH];


      --~--~---------~--~----~------------~-------~--~----~
      You received this message from the "vim_multibyte" maillist.
      For more information, visit http://www.vim.org/maillist.php
      -~----------~----~----~----~------~----~------~--~---
    • Show all 9 messages in this topic