|
 |
99b86a7 |
To: vim-dev@vim.org
|
|
|
99b86a7 |
Subject: patch 7.1.080 (extra)
|
|
|
99b86a7 |
Fcc: outbox
|
|
|
99b86a7 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
99b86a7 |
Mime-Version: 1.0
|
|
|
99b86a7 |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
99b86a7 |
Content-Transfer-Encoding: 8bit
|
|
|
99b86a7 |
------------
|
|
|
99b86a7 |
|
|
|
99b86a7 |
Patch 7.1.080 (extra)
|
|
|
99b86a7 |
Problem: Compiler warnings for using "const char *" for "char *".
|
|
|
99b86a7 |
Solution: Add type casts. (Chris Sutcliffe)
|
|
|
99b86a7 |
Files: src/GvimExt/gvimext.cpp
|
|
|
99b86a7 |
|
|
|
99b86a7 |
|
|
|
99b86a7 |
*** ../vim-7.1.079/src/GvimExt/gvimext.cpp Thu May 10 21:09:38 2007
|
|
|
99b86a7 |
--- src/GvimExt/gvimext.cpp Thu Aug 16 21:25:56 2007
|
|
|
99b86a7 |
***************
|
|
|
99b86a7 |
*** 69,82 ****
|
|
|
99b86a7 |
|
|
|
99b86a7 |
// Registry didn't work, use the search path.
|
|
|
99b86a7 |
if (name[0] == 0)
|
|
|
99b86a7 |
! strcpy(name, searchpath("gvim.exe"));
|
|
|
99b86a7 |
|
|
|
99b86a7 |
if (!runtime)
|
|
|
99b86a7 |
{
|
|
|
99b86a7 |
// Only when looking for the executable, not the runtime dir, we can
|
|
|
99b86a7 |
// search for the batch file or a name without a path.
|
|
|
99b86a7 |
if (name[0] == 0)
|
|
|
99b86a7 |
! strcpy(name, searchpath("gvim.bat"));
|
|
|
99b86a7 |
if (name[0] == 0)
|
|
|
99b86a7 |
strcpy(name, "gvim"); // finds gvim.bat or gvim.exe
|
|
|
99b86a7 |
|
|
|
99b86a7 |
--- 69,82 ----
|
|
|
99b86a7 |
|
|
|
99b86a7 |
// Registry didn't work, use the search path.
|
|
|
99b86a7 |
if (name[0] == 0)
|
|
|
99b86a7 |
! strcpy(name, searchpath((char *)"gvim.exe"));
|
|
|
99b86a7 |
|
|
|
99b86a7 |
if (!runtime)
|
|
|
99b86a7 |
{
|
|
|
99b86a7 |
// Only when looking for the executable, not the runtime dir, we can
|
|
|
99b86a7 |
// search for the batch file or a name without a path.
|
|
|
99b86a7 |
if (name[0] == 0)
|
|
|
99b86a7 |
! strcpy(name, searchpath((char *)"gvim.bat"));
|
|
|
99b86a7 |
if (name[0] == 0)
|
|
|
99b86a7 |
strcpy(name, "gvim"); // finds gvim.bat or gvim.exe
|
|
|
99b86a7 |
|
|
|
99b86a7 |
***************
|
|
|
99b86a7 |
*** 152,160 ****
|
|
|
99b86a7 |
FARPROC *ptr;
|
|
|
99b86a7 |
} libintl_entry[] =
|
|
|
99b86a7 |
{
|
|
|
99b86a7 |
! {"gettext", (FARPROC*)&dyn_libintl_gettext},
|
|
|
99b86a7 |
! {"textdomain", (FARPROC*)&dyn_libintl_textdomain},
|
|
|
99b86a7 |
! {"bindtextdomain", (FARPROC*)&dyn_libintl_bindtextdomain},
|
|
|
99b86a7 |
{NULL, NULL}
|
|
|
99b86a7 |
};
|
|
|
99b86a7 |
|
|
|
99b86a7 |
--- 152,160 ----
|
|
|
99b86a7 |
FARPROC *ptr;
|
|
|
99b86a7 |
} libintl_entry[] =
|
|
|
99b86a7 |
{
|
|
|
99b86a7 |
! {(char *)"gettext", (FARPROC*)&dyn_libintl_gettext},
|
|
|
99b86a7 |
! {(char *)"textdomain", (FARPROC*)&dyn_libintl_textdomain},
|
|
|
99b86a7 |
! {(char *)"bindtextdomain", (FARPROC*)&dyn_libintl_bindtextdomain},
|
|
|
99b86a7 |
{NULL, NULL}
|
|
|
99b86a7 |
};
|
|
|
99b86a7 |
|
|
|
99b86a7 |
***************
|
|
|
99b86a7 |
*** 835,841 ****
|
|
|
99b86a7 |
(LPTSTR)location) > (HINSTANCE)32)
|
|
|
99b86a7 |
return location;
|
|
|
99b86a7 |
}
|
|
|
99b86a7 |
! return "";
|
|
|
99b86a7 |
}
|
|
|
99b86a7 |
# endif
|
|
|
99b86a7 |
#endif
|
|
|
99b86a7 |
--- 835,841 ----
|
|
|
99b86a7 |
(LPTSTR)location) > (HINSTANCE)32)
|
|
|
99b86a7 |
return location;
|
|
|
99b86a7 |
}
|
|
|
99b86a7 |
! return (char *)"";
|
|
|
99b86a7 |
}
|
|
|
99b86a7 |
# endif
|
|
|
99b86a7 |
#endif
|
|
|
99b86a7 |
*** ../vim-7.1.079/src/version.c Wed Aug 15 20:40:45 2007
|
|
|
99b86a7 |
--- src/version.c Sat Aug 18 16:58:36 2007
|
|
|
99b86a7 |
***************
|
|
|
99b86a7 |
*** 668,669 ****
|
|
|
99b86a7 |
--- 668,671 ----
|
|
|
99b86a7 |
{ /* Add new patch number below this line */
|
|
|
99b86a7 |
+ /**/
|
|
|
99b86a7 |
+ 80,
|
|
|
99b86a7 |
/**/
|
|
|
99b86a7 |
|
|
|
99b86a7 |
--
|
|
|
99b86a7 |
hundred-and-one symptoms of being an internet addict:
|
|
|
99b86a7 |
192. Your boss asks you to "go fer" coffee and you come up with 235 FTP sites.
|
|
|
99b86a7 |
|
|
|
99b86a7 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
99b86a7 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
99b86a7 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
99b86a7 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|