Mercurial > vim
changeset 3927:e6d8b44065bc v7.3.719
updated for version 7.3.719
Problem: Cannot run new version of cproto, it fails on missing include
files.
Solution: Add lots of #ifndef PROTO
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Tue, 20 Nov 2012 16:53:39 +0100 |
parents | 3ea4cfe2d1df |
children | eab895a03ba9 |
files | src/gui_photon.c src/gui_w16.c src/gui_w32.c src/gui_w48.c src/os_amiga.c src/os_amiga.h src/os_beos.c src/os_beos.h src/os_msdos.c src/os_msdos.h src/os_mswin.c src/os_unix.h src/os_win16.c src/os_win16.h src/os_win32.c src/os_win32.h src/version.c src/vimio.h |
diffstat | 18 files changed, 178 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui_photon.c +++ b/src/gui_photon.c @@ -13,8 +13,11 @@ #include "vim.h" -#ifdef FEAT_TOOLBAR -# include <photon/PxImage.h> +/* cproto fails on missing include files */ +#ifndef PROTO +# ifdef FEAT_TOOLBAR +# include <photon/PxImage.h> +# endif #endif #if !defined(__QNX__)
--- a/src/gui_w16.c +++ b/src/gui_w16.c @@ -1521,7 +1521,12 @@ get_dialog_font_metrics(void) #if defined(FEAT_TOOLBAR) || defined(PROTO) -#include "gui_w3~1.h" + +/* 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
--- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -198,11 +198,17 @@ static BalloonEval *cur_beval = NULL; 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 <pshpack1.h> +# include <pshpack1.h> + +#endif typedef struct _DllVersionInfo { @@ -213,7 +219,9 @@ typedef struct _DllVersionInfo DWORD dwPlatformID; } DLLVERSIONINFO; -#include <poppack.h> +#ifndef PROTO +# include <poppack.h> +#endif typedef struct tagTOOLINFOA_NEW {
--- a/src/gui_w48.c +++ b/src/gui_w48.c @@ -25,6 +25,10 @@ #ifdef DEBUG # include <tchar.h> #endif + +/* cproto fails on missing include files */ +#ifndef PROTO + #ifndef __MINGW32__ # include <shellapi.h> #endif @@ -44,6 +48,8 @@ # include "glbl_ime.h" #endif +#endif /* PROTO */ + #ifdef FEAT_MENU # define MENUHINTS /* show menu hints in command line */ #endif
--- a/src/os_amiga.c +++ b/src/os_amiga.c @@ -22,6 +22,9 @@ #undef TRUE /* will be redefined by exec/types.h */ #undef FALSE +/* cproto fails on missing include files, skip them */ +#ifndef PROTO + #ifndef LATTICE # include <exec/types.h> # include <exec/exec.h> @@ -55,6 +58,8 @@ # include <libraries/arp_pragmas.h> #endif +#endif /* PROTO */ + /* * At this point TRUE and FALSE are defined as 1L and 0L, but we want 1 and 0. */ @@ -283,7 +288,9 @@ mch_init() #endif } -#include <workbench/startup.h> +#ifndef PROTO +# include <workbench/startup.h> +#endif /* * Check_win checks whether we have an interactive window. @@ -1002,7 +1009,9 @@ mch_screenmode(arg) * Heavely modified by mool. */ -#include <devices/conunit.h> +#ifndef PROTO +# include <devices/conunit.h> +#endif /* * try to get the real window size @@ -1129,9 +1138,11 @@ out_num(n) * say 'oml lib:amiga.lib -r sendpacket.o' */ +#ifndef PROTO /* #include <proto/exec.h> */ /* #include <proto/dos.h> */ -#include <exec/memory.h> +# include <exec/memory.h> +#endif /* * Function - dos_packet written by Phil Lindsay, Carolyn Scheppner, and Andy
--- a/src/os_amiga.h +++ b/src/os_amiga.h @@ -56,6 +56,9 @@ # define TEMPNAMELEN 12 #endif +/* cproto fails on missing include files */ +#ifndef PROTO + #include <exec/types.h> #include <libraries/dos.h> #include <libraries/dosextens.h> @@ -67,6 +70,8 @@ # include <proto/intuition.h> #endif +#endif /* PROTO */ + #define FNAME_ILLEGAL ";*?`#%" /* illegal characters in a file name */ /* @@ -85,6 +90,7 @@ typedef long off_t; # include <unistd.h> #endif +#ifndef PROTO /* * arpbase.h must be included before functions.h */ @@ -92,6 +98,8 @@ typedef long off_t; # include <libraries/arpbase.h> #endif +#endif /* PROTO */ + /* * This won't be needed if you have a version of Lattice 4.01 without broken * break signal handling.
--- a/src/os_beos.c +++ b/src/os_beos.c @@ -13,7 +13,10 @@ #include <float.h> #include <termios.h> -#include <kernel/OS.h> +#ifndef PROTO +# include <kernel/OS.h> +#endif + #include "vim.h" #if USE_THREAD_FOR_INPUT_WITH_TIMEOUT
--- a/src/os_beos.h +++ b/src/os_beos.h @@ -22,4 +22,6 @@ /* select emulation */ -#include <net/socket.h> /* for typedefs and #defines only */ +#ifndef PROTO +# include <net/socket.h> /* for typedefs and #defines only */ +#endif
--- a/src/os_msdos.c +++ b/src/os_msdos.c @@ -23,7 +23,10 @@ #include "vim.h" -#include <conio.h> +/* cproto fails on missing include files */ +#ifndef PROTO +# include <conio.h> +#endif /* * MS-DOS only code, not used for Win16. @@ -31,17 +34,19 @@ #ifndef WIN16 -#include <bios.h> -#ifdef DJGPP -# include <dpmi.h> -# include <signal.h> -# include <sys/movedata.h> -# include <crt0.h> -# ifdef FEAT_CLIPBOARD -# include <sys/segments.h> +#ifndef PROTO +# include <bios.h> +# ifdef DJGPP +# include <dpmi.h> +# include <signal.h> +# include <sys/movedata.h> +# include <crt0.h> +# ifdef FEAT_CLIPBOARD +# include <sys/segments.h> +# endif +# else +# include <alloc.h> # endif -#else -# include <alloc.h> #endif #if defined(DJGPP) || defined(PROTO) @@ -2130,8 +2135,10 @@ mch_rename(const char *OldFile, const ch #undef setlocale -#include <go32.h> -#include <inlines/ctype.ha> +#ifndef PROTO +# include <go32.h> +# include <inlines/ctype.ha> +#endif #include <locale.h> #define UPCASE (__dj_ISALNUM | __dj_ISALPHA | __dj_ISGRAPH | __dj_ISPRINT | __dj_ISUPPER)
--- a/src/os_msdos.h +++ b/src/os_msdos.h @@ -53,9 +53,12 @@ #define FNAME_ILLEGAL "\"*?><|" /* illegal characters in a file name */ -#include <dos.h> -#include <dir.h> -#include <time.h> +/* cproto fails on missing include files */ +#ifndef PROTO +# include <dos.h> +# include <dir.h> +# include <time.h> +#endif #ifdef DJGPP # include <unistd.h>
--- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -26,13 +26,18 @@ #ifdef WIN16 # define SHORT_FNAME /* always 8.3 file name */ -# include <dos.h> +/* cproto fails on missing include files */ +# ifndef PROTO +# include <dos.h> +# endif # include <string.h> #endif #include <sys/types.h> #include <signal.h> #include <limits.h> -#include <process.h> +#ifndef PROTO +# include <process.h> +#endif #undef chdir #ifdef __GNUC__ @@ -43,19 +48,22 @@ # include <direct.h> #endif -#if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32) -# include <shellapi.h> +#ifndef PROTO +# if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32) +# include <shellapi.h> +# endif + +# if defined(FEAT_PRINTER) && !defined(FEAT_POSTSCRIPT) +# include <dlgs.h> +# ifdef WIN3264 +# include <winspool.h> +# else +# include <print.h> +# endif +# include <commdlg.h> #endif -#if defined(FEAT_PRINTER) && !defined(FEAT_POSTSCRIPT) -# include <dlgs.h> -# ifdef WIN3264 -# include <winspool.h> -# else -# include <print.h> -# endif -# include <commdlg.h> -#endif +#endif /* PROTO */ #ifdef __MINGW32__ # ifndef FROM_LEFT_1ST_BUTTON_PRESSED @@ -2410,7 +2418,9 @@ mch_print_set_fg(long_u fgcol) #if defined(FEAT_SHORTCUT) || defined(PROTO) -# include <shlobj.h> +# ifndef PROTO +# include <shlobj.h> +# endif /* * When "fname" is the name of a shortcut (*.lnk) resolve the file it points
--- a/src/os_unix.h +++ b/src/os_unix.h @@ -198,6 +198,9 @@ # define HAVE_TOTAL_MEM #endif + +#ifndef PROTO + #ifdef VMS # include <unixio.h> # include <unixlib.h> @@ -226,7 +229,11 @@ # ifdef FEAT_GUI_GTK # include "gui_gtk_vms.h" # endif +#endif +#endif /* PROTO */ + +#ifdef VMS typedef struct dsc$descriptor DESC; #endif
--- a/src/os_win16.c +++ b/src/os_win16.c @@ -22,16 +22,23 @@ #include "vim.h" -#include <dos.h> +/* cproto fails on missing include files */ +#ifndef PROTO +# include <dos.h> +#endif + #include <string.h> #include <sys/types.h> #include <signal.h> #include <limits.h> -#include <process.h> + +#ifndef PROTO +# include <process.h> -#undef chdir -#include <direct.h> -#include <shellapi.h> /* required for FindExecutable() */ +# undef chdir +# include <direct.h> +# include <shellapi.h> /* required for FindExecutable() */ +#endif /* Record all output and all keyboard & mouse input */
--- a/src/os_win16.h +++ b/src/os_win16.h @@ -63,16 +63,21 @@ typedef long off_t; #include <stdlib.h> #include <time.h> -#include <dos.h> -#include <dir.h> + +/* cproto fails on missing include files */ +#ifndef PROTO +# include <dos.h> +# include <dir.h> -#ifndef STRICT -# define STRICT -#endif -#ifndef COBJMACROS -# define COBJMACROS /* For OLE: Enable "friendlier" access to objects */ -#endif -#include <windows.h> +# ifndef STRICT +# define STRICT +# endif +# ifndef COBJMACROS +# define COBJMACROS /* For OLE: Enable "friendlier" access to objects */ +# endif +# include <windows.h> + +#endif /* PROTO */ /* * plenty of memory, use large buffers
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -29,7 +29,11 @@ #include <sys/types.h> #include <signal.h> #include <limits.h> -#include <process.h> + +/* cproto fails on missing include files */ +#ifndef PROTO +# include <process.h> +#endif #undef chdir #ifdef __GNUC__ @@ -40,8 +44,10 @@ # include <direct.h> #endif -#if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32) -# include <shellapi.h> +#ifndef PROTO +# if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32) +# include <shellapi.h> +# endif #endif #ifdef __MINGW32__ @@ -125,6 +131,7 @@ typedef int TRUSTEE; typedef int WORD; typedef int WCHAR; typedef void VOID; +typedef int BY_HANDLE_FILE_INFORMATION; #endif #ifndef FEAT_GUI_W32 @@ -152,6 +159,8 @@ static PFNGCKLN s_pfnGetConsoleKeyboa # 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,6 +169,8 @@ BOOL (WINAPI *pIsDialogMessage)(HWND, LP 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,7 +464,10 @@ null_libintl_textdomain(const char *doma DWORD g_PlatformId; #ifdef HAVE_ACL -# include <aclapi.h> +# ifndef PROTO +# include <aclapi.h> +# endif + /* * These are needed to dynamically load the ADVAPI DLL, which is not * implemented under Windows 95 (and causes VIM to crash) @@ -1658,8 +1672,10 @@ theend: #endif /* FEAT_GUI_W32 */ } -#ifndef __MINGW32__ -# include <shellapi.h> /* required for FindExecutable() */ +#ifndef PROTO +# ifndef __MINGW32__ +# include <shellapi.h> /* required for FindExecutable() */ +# endif #endif /*
--- a/src/os_win32.h +++ b/src/os_win32.h @@ -12,7 +12,10 @@ #include "os_dos.h" /* common MS-DOS and Win32 stuff */ #ifndef __CYGWIN__ -#include <direct.h> /* for _mkdir() */ +/* cproto fails on missing include files */ +# ifndef PROTO +# include <direct.h> /* for _mkdir() */ +# endif #endif /* Stop the VC2005 compiler from nagging. */ @@ -101,7 +104,9 @@ #ifndef COBJMACROS # define COBJMACROS /* For OLE: Enable "friendlier" access to objects */ #endif -#include <windows.h> +#ifndef PROTO +# include <windows.h> +#endif /* * Win32 has plenty of memory, use large buffers @@ -194,6 +199,8 @@ Trace(char *pszFormat, ...); # 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,3 +214,5 @@ extern BOOL (WINAPI *pPeekMessage)(LPMSG # define pIsDialogMessage IsDialogMessage # define pPeekMessage PeekMessage #endif + +#endif /* PROTO */