Merge pull request #3927 from sethjackson/if-cscope

Windows: Bring back code branch for if_cscope
This commit is contained in:
Justin M. Keyes 2016-01-02 12:35:21 -05:00
commit cb62594042
3 changed files with 21 additions and 3 deletions

View File

@ -743,8 +743,16 @@ err_closing:
(void)close(to_cs[1]);
(void)close(from_cs[0]);
#else
/* WIN32 */
/* Create pipes to communicate with cscope */
// Create pipes to communicate with cscope
int fd;
SECURITY_ATTRIBUTES sa;
PROCESS_INFORMATION pi;
BOOL pipe_stdin = FALSE, pipe_stdout = FALSE; // NOLINT(readability/bool)
STARTUPINFO si;
HANDLE stdin_rd, stdout_rd;
HANDLE stdout_wr, stdin_wr;
BOOL created;
sa.nLength = sizeof(SECURITY_ATTRIBUTES);
sa.bInheritHandle = TRUE;
sa.lpSecurityDescriptor = NULL;

View File

@ -16,6 +16,7 @@
# include <sys/types.h> /* pid_t */
#endif
#include "nvim/os/os_defs.h"
#include "nvim/os/fs_defs.h"
#define CSCOPE_SUCCESS 0
@ -50,7 +51,13 @@ typedef struct csi {
char * ppath; /* path to prepend (the -P option) */
char * flags; /* additional cscope flags/options (e.g, -p2) */
#if defined(UNIX)
pid_t pid; /* PID of the connected cscope process. */
pid_t pid; // PID of the connected cscope process
#else
DWORD pid; // PID of the connected cscope process
HANDLE hProc; // cscope process handle
DWORD nVolume; // Volume serial number, instead of st_dev
DWORD nIndexHigh; // st_ino has no meaning on Windows
DWORD nIndexLow;
#endif
FileID file_id;

View File

@ -57,6 +57,9 @@
#if !defined(S_ISREG) && defined(S_IFREG)
# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
#endif
#if !defined(S_ISLNK) && defined(S_IFLNK)
# define S_IFLNK(m) (((m) & S_IFMT) == S_IFLNK)
#endif
#if !defined(S_ISBLK) && defined(S_IFBLK)
# define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
#endif