To: vim_dev@googlegroups.com Subject: Patch 7.3.719 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.3.719 Problem: Cannot run new version of cproto, it fails on missing include files. Solution: Add lots of #ifndef PROTO Files: src/os_amiga.c, src/os_amiga.h, src/gui_w16.c, src/gui_w48.c, src/gui_w32.c, src/vimio.h, src/os_msdos.c, src/os_msdos.h, src/os_win16.h, src/os_win16.c, src/os_win32.h, src/os_win32.c, src/os_mswin.c, src/gui_photon.c, src/os_unix.h, src/os_beos.c, src/os_beos.h *** ../vim-7.3.718/src/os_amiga.c 2012-06-29 15:51:26.000000000 +0200 --- src/os_amiga.c 2012-11-20 15:47:31.000000000 +0100 *************** *** 22,27 **** --- 22,30 ---- #undef TRUE /* will be redefined by exec/types.h */ #undef FALSE + /* cproto fails on missing include files, skip them */ + #ifndef PROTO + #ifndef LATTICE # include # include *************** *** 55,60 **** --- 58,65 ---- # include #endif + #endif /* PROTO */ + /* * At this point TRUE and FALSE are defined as 1L and 0L, but we want 1 and 0. */ *************** *** 283,289 **** #endif } ! #include /* * Check_win checks whether we have an interactive window. --- 288,296 ---- #endif } ! #ifndef PROTO ! # include ! #endif /* * Check_win checks whether we have an interactive window. *************** *** 1002,1008 **** * Heavely modified by mool. */ ! #include /* * try to get the real window size --- 1009,1017 ---- * Heavely modified by mool. */ ! #ifndef PROTO ! # include ! #endif /* * try to get the real window size *************** *** 1129,1137 **** * say 'oml lib:amiga.lib -r sendpacket.o' */ /* #include */ /* #include */ ! #include /* * Function - dos_packet written by Phil Lindsay, Carolyn Scheppner, and Andy --- 1138,1148 ---- * say 'oml lib:amiga.lib -r sendpacket.o' */ + #ifndef PROTO /* #include */ /* #include */ ! # include ! #endif /* * Function - dos_packet written by Phil Lindsay, Carolyn Scheppner, and Andy *** ../vim-7.3.718/src/os_amiga.h 2010-08-15 21:57:25.000000000 +0200 --- src/os_amiga.h 2012-11-20 15:46:37.000000000 +0100 *************** *** 56,61 **** --- 56,64 ---- # define TEMPNAMELEN 12 #endif + /* cproto fails on missing include files */ + #ifndef PROTO + #include #include #include *************** *** 67,72 **** --- 70,77 ---- # include #endif + #endif /* PROTO */ + #define FNAME_ILLEGAL ";*?`#%" /* illegal characters in a file name */ /* *************** *** 85,90 **** --- 90,96 ---- # include #endif + #ifndef PROTO /* * arpbase.h must be included before functions.h */ *************** *** 92,97 **** --- 98,105 ---- # include #endif + #endif /* PROTO */ + /* * This won't be needed if you have a version of Lattice 4.01 without broken * break signal handling. *** ../vim-7.3.718/src/gui_w16.c 2012-02-04 22:01:44.000000000 +0100 --- src/gui_w16.c 2012-11-20 15:55:04.000000000 +0100 *************** *** 1521,1527 **** #if defined(FEAT_TOOLBAR) || defined(PROTO) ! #include "gui_w3~1.h" /* * Create the toolbar, initially unpopulated. * (just like the menu, there are no defaults, it's all --- 1521,1532 ---- #if defined(FEAT_TOOLBAR) || defined(PROTO) ! ! /* cproto fails on missing include files */ ! #ifndef PROTO ! # include "gui_w3~1.h" ! #endif ! /* * Create the toolbar, initially unpopulated. * (just like the menu, there are no defaults, it's all *** ../vim-7.3.718/src/gui_w48.c 2012-01-20 20:54:15.000000000 +0100 --- src/gui_w48.c 2012-11-20 15:53:49.000000000 +0100 *************** *** 25,30 **** --- 25,34 ---- #ifdef DEBUG # include #endif + + /* cproto fails on missing include files */ + #ifndef PROTO + #ifndef __MINGW32__ # include #endif *************** *** 44,49 **** --- 48,55 ---- # include "glbl_ime.h" #endif + #endif /* PROTO */ + #ifdef FEAT_MENU # define MENUHINTS /* show menu hints in command line */ #endif *** ../vim-7.3.718/src/gui_w32.c 2012-01-04 20:29:18.000000000 +0100 --- src/gui_w32.c 2012-11-20 15:56:31.000000000 +0100 *************** *** 198,208 **** static UINT_PTR BevalTimerId = 0; static DWORD LastActivity = 0; /* * excerpts from headers since this may not be presented * in the extremely old compilers */ ! #include typedef struct _DllVersionInfo { --- 198,214 ---- static UINT_PTR BevalTimerId = 0; static DWORD LastActivity = 0; + + /* cproto fails on missing include files */ + #ifndef PROTO + /* * excerpts from headers since this may not be presented * in the extremely old compilers */ ! # include ! ! #endif typedef struct _DllVersionInfo { *************** *** 213,219 **** DWORD dwPlatformID; } DLLVERSIONINFO; ! #include typedef struct tagTOOLINFOA_NEW { --- 219,227 ---- DWORD dwPlatformID; } DLLVERSIONINFO; ! #ifndef PROTO ! # include ! #endif typedef struct tagTOOLINFOA_NEW { *** ../vim-7.3.718/src/vimio.h 2010-08-15 21:57:28.000000000 +0200 --- src/vimio.h 2012-11-20 15:57:19.000000000 +0100 *************** *** 13,16 **** # define _CRT_NONSTDC_NO_DEPRECATE #endif ! #include --- 13,19 ---- # define _CRT_NONSTDC_NO_DEPRECATE #endif ! /* cproto fails on missing include files */ ! #ifndef PROTO ! # include ! #endif *** ../vim-7.3.718/src/os_msdos.c 2012-06-29 15:51:26.000000000 +0200 --- src/os_msdos.c 2012-11-20 15:59:18.000000000 +0100 *************** *** 23,29 **** #include "vim.h" ! #include /* * MS-DOS only code, not used for Win16. --- 23,32 ---- #include "vim.h" ! /* cproto fails on missing include files */ ! #ifndef PROTO ! # include ! #endif /* * MS-DOS only code, not used for Win16. *************** *** 31,47 **** #ifndef WIN16 ! #include ! #ifdef DJGPP ! # include ! # include ! # include ! # include ! # ifdef FEAT_CLIPBOARD ! # include # endif - #else - # include #endif #if defined(DJGPP) || defined(PROTO) --- 34,52 ---- #ifndef WIN16 ! #ifndef PROTO ! # include ! # ifdef DJGPP ! # include ! # include ! # include ! # include ! # ifdef FEAT_CLIPBOARD ! # include ! # endif ! # else ! # include # endif #endif #if defined(DJGPP) || defined(PROTO) *************** *** 2130,2137 **** #undef setlocale ! #include ! #include #include #define UPCASE (__dj_ISALNUM | __dj_ISALPHA | __dj_ISGRAPH | __dj_ISPRINT | __dj_ISUPPER) --- 2135,2144 ---- #undef setlocale ! #ifndef PROTO ! # include ! # include ! #endif #include #define UPCASE (__dj_ISALNUM | __dj_ISALPHA | __dj_ISGRAPH | __dj_ISPRINT | __dj_ISUPPER) *** ../vim-7.3.718/src/os_msdos.h 2010-08-15 21:57:25.000000000 +0200 --- src/os_msdos.h 2012-11-20 15:57:48.000000000 +0100 *************** *** 53,61 **** #define FNAME_ILLEGAL "\"*?><|" /* illegal characters in a file name */ ! #include ! #include ! #include #ifdef DJGPP # include --- 53,64 ---- #define FNAME_ILLEGAL "\"*?><|" /* illegal characters in a file name */ ! /* cproto fails on missing include files */ ! #ifndef PROTO ! # include ! # include ! # include ! #endif #ifdef DJGPP # include *** ../vim-7.3.718/src/os_win16.h 2010-08-15 21:57:25.000000000 +0200 --- src/os_win16.h 2012-11-20 16:00:33.000000000 +0100 *************** *** 63,78 **** #include #include - #include - #include ! #ifndef STRICT ! # define STRICT ! #endif ! #ifndef COBJMACROS ! # define COBJMACROS /* For OLE: Enable "friendlier" access to objects */ ! #endif ! #include /* * plenty of memory, use large buffers --- 63,83 ---- #include #include ! /* cproto fails on missing include files */ ! #ifndef PROTO ! # include ! # include ! ! # ifndef STRICT ! # define STRICT ! # endif ! # ifndef COBJMACROS ! # define COBJMACROS /* For OLE: Enable "friendlier" access to objects */ ! # endif ! # include ! ! #endif /* PROTO */ /* * plenty of memory, use large buffers *** ../vim-7.3.718/src/os_win16.c 2012-06-29 15:51:26.000000000 +0200 --- src/os_win16.c 2012-11-20 16:01:50.000000000 +0100 *************** *** 22,37 **** #include "vim.h" ! #include #include #include #include #include - #include ! #undef chdir ! #include ! #include /* required for FindExecutable() */ /* Record all output and all keyboard & mouse input */ --- 22,44 ---- #include "vim.h" ! /* cproto fails on missing include files */ ! #ifndef PROTO ! # include ! #endif ! #include #include #include #include ! #ifndef PROTO ! # include ! ! # undef chdir ! # include ! # include /* required for FindExecutable() */ ! #endif /* Record all output and all keyboard & mouse input */ *** ../vim-7.3.718/src/os_win32.h 2012-10-21 21:38:42.000000000 +0200 --- src/os_win32.h 2012-11-20 16:09:59.000000000 +0100 *************** *** 12,18 **** #include "os_dos.h" /* common MS-DOS and Win32 stuff */ #ifndef __CYGWIN__ ! #include /* for _mkdir() */ #endif /* Stop the VC2005 compiler from nagging. */ --- 12,21 ---- #include "os_dos.h" /* common MS-DOS and Win32 stuff */ #ifndef __CYGWIN__ ! /* cproto fails on missing include files */ ! # ifndef PROTO ! # include /* for _mkdir() */ ! # endif #endif /* Stop the VC2005 compiler from nagging. */ *************** *** 101,107 **** #ifndef COBJMACROS # define COBJMACROS /* For OLE: Enable "friendlier" access to objects */ #endif ! #include /* * Win32 has plenty of memory, use large buffers --- 104,112 ---- #ifndef COBJMACROS # define COBJMACROS /* For OLE: Enable "friendlier" access to objects */ #endif ! #ifndef PROTO ! # include ! #endif /* * Win32 has plenty of memory, use large buffers *************** *** 194,199 **** --- 199,206 ---- # define vim_mkdir(x, y) mch_mkdir(x) #endif + #ifndef PROTO + /* Enable common dialogs input unicode from IME if posible. */ #ifdef FEAT_MBYTE /* The variables are defined in os_win32.c. */ *************** *** 207,209 **** --- 214,218 ---- # define pIsDialogMessage IsDialogMessage # define pPeekMessage PeekMessage #endif + + #endif /* PROTO */ *** ../vim-7.3.718/src/os_win32.c 2012-10-21 21:38:42.000000000 +0200 --- src/os_win32.c 2012-11-20 16:12:09.000000000 +0100 *************** *** 29,35 **** #include #include #include ! #include #undef chdir #ifdef __GNUC__ --- 29,39 ---- #include #include #include ! ! /* cproto fails on missing include files */ ! #ifndef PROTO ! # include ! #endif #undef chdir #ifdef __GNUC__ *************** *** 40,47 **** # include #endif ! #if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32) ! # include #endif #ifdef __MINGW32__ --- 44,53 ---- # include #endif ! #ifndef PROTO ! # if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32) ! # include ! # endif #endif #ifdef __MINGW32__ *************** *** 125,130 **** --- 131,137 ---- typedef int WORD; typedef int WCHAR; typedef void VOID; + typedef int BY_HANDLE_FILE_INFORMATION; #endif #ifndef FEAT_GUI_W32 *************** *** 152,157 **** --- 159,166 ---- # define wcsicmp(a, b) wcscmpi((a), (b)) #endif + #ifndef PROTO + /* Enable common dialogs input unicode from IME if posible. */ #ifdef FEAT_MBYTE LRESULT (WINAPI *pDispatchMessage)(LPMSG) = DispatchMessage; *************** *** 160,165 **** --- 169,176 ---- BOOL (WINAPI *pPeekMessage)(LPMSG, HWND, UINT, UINT, UINT) = PeekMessage; #endif + #endif /* PROTO */ + #ifndef FEAT_GUI_W32 /* Win32 Console handles for input and output */ static HANDLE g_hConIn = INVALID_HANDLE_VALUE; *************** *** 453,459 **** DWORD g_PlatformId; #ifdef HAVE_ACL ! # include /* * These are needed to dynamically load the ADVAPI DLL, which is not * implemented under Windows 95 (and causes VIM to crash) --- 464,473 ---- DWORD g_PlatformId; #ifdef HAVE_ACL ! # ifndef PROTO ! # include ! # endif ! /* * These are needed to dynamically load the ADVAPI DLL, which is not * implemented under Windows 95 (and causes VIM to crash) *************** *** 1658,1665 **** #endif /* FEAT_GUI_W32 */ } ! #ifndef __MINGW32__ ! # include /* required for FindExecutable() */ #endif /* --- 1672,1681 ---- #endif /* FEAT_GUI_W32 */ } ! #ifndef PROTO ! # ifndef __MINGW32__ ! # include /* required for FindExecutable() */ ! # endif #endif /* *** ../vim-7.3.718/src/os_mswin.c 2011-11-30 13:42:40.000000000 +0100 --- src/os_mswin.c 2012-11-20 16:15:05.000000000 +0100 *************** *** 26,38 **** #ifdef WIN16 # define SHORT_FNAME /* always 8.3 file name */ ! # include # include #endif #include #include #include ! #include #undef chdir #ifdef __GNUC__ --- 26,43 ---- #ifdef WIN16 # define SHORT_FNAME /* always 8.3 file name */ ! /* cproto fails on missing include files */ ! # ifndef PROTO ! # include ! # endif # include #endif #include #include #include ! #ifndef PROTO ! # include ! #endif #undef chdir #ifdef __GNUC__ *************** *** 43,62 **** # include #endif ! #if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32) ! # include ! #endif ! ! #if defined(FEAT_PRINTER) && !defined(FEAT_POSTSCRIPT) ! # include ! # ifdef WIN3264 ! # include ! # else ! # include # endif ! # include #endif #ifdef __MINGW32__ # ifndef FROM_LEFT_1ST_BUTTON_PRESSED # define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001 --- 48,70 ---- # include #endif ! #ifndef PROTO ! # if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32) ! # include # endif ! ! # if defined(FEAT_PRINTER) && !defined(FEAT_POSTSCRIPT) ! # include ! # ifdef WIN3264 ! # include ! # else ! # include ! # endif ! # include #endif + #endif /* PROTO */ + #ifdef __MINGW32__ # ifndef FROM_LEFT_1ST_BUTTON_PRESSED # define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001 *************** *** 2410,2416 **** #if defined(FEAT_SHORTCUT) || defined(PROTO) ! # include /* * When "fname" is the name of a shortcut (*.lnk) resolve the file it points --- 2418,2426 ---- #if defined(FEAT_SHORTCUT) || defined(PROTO) ! # ifndef PROTO ! # include ! # endif /* * When "fname" is the name of a shortcut (*.lnk) resolve the file it points *** ../vim-7.3.718/src/gui_photon.c 2011-09-14 16:04:52.000000000 +0200 --- src/gui_photon.c 2012-11-20 16:16:11.000000000 +0100 *************** *** 13,20 **** #include "vim.h" ! #ifdef FEAT_TOOLBAR ! # include #endif #if !defined(__QNX__) --- 13,23 ---- #include "vim.h" ! /* cproto fails on missing include files */ ! #ifndef PROTO ! # ifdef FEAT_TOOLBAR ! # include ! # endif #endif #if !defined(__QNX__) *** ../vim-7.3.718/src/os_unix.h 2011-02-25 15:17:14.000000000 +0100 --- src/os_unix.h 2012-11-20 16:51:06.000000000 +0100 *************** *** 198,203 **** --- 198,206 ---- # define HAVE_TOTAL_MEM #endif + + #ifndef PROTO + #ifdef VMS # include # include *************** *** 226,232 **** --- 229,239 ---- # ifdef FEAT_GUI_GTK # include "gui_gtk_vms.h" # endif + #endif + #endif /* PROTO */ + + #ifdef VMS typedef struct dsc$descriptor DESC; #endif *** ../vim-7.3.718/src/os_beos.c 2010-08-15 21:57:28.000000000 +0200 --- src/os_beos.c 2012-11-20 16:22:17.000000000 +0100 *************** *** 13,19 **** #include #include ! #include #include "vim.h" #if USE_THREAD_FOR_INPUT_WITH_TIMEOUT --- 13,22 ---- #include #include ! #ifndef PROTO ! # include ! #endif ! #include "vim.h" #if USE_THREAD_FOR_INPUT_WITH_TIMEOUT *** ../vim-7.3.718/src/os_beos.h 2010-08-15 21:57:32.000000000 +0200 --- src/os_beos.h 2012-11-20 16:22:48.000000000 +0100 *************** *** 22,25 **** /* select emulation */ ! #include /* for typedefs and #defines only */ --- 22,27 ---- /* select emulation */ ! #ifndef PROTO ! # include /* for typedefs and #defines only */ ! #endif *** ../vim-7.3.718/src/version.c 2012-11-20 12:16:54.000000000 +0100 --- src/version.c 2012-11-20 16:32:18.000000000 +0100 *************** *** 727,728 **** --- 727,730 ---- { /* Add new patch number below this line */ + /**/ + 719, /**/ -- George: "I just got a new set of golf clubs for my wife!" John: "Great trade!" /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///