projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was generated by cvs2svn to compensate for changes in r1383,
[chise/xemacs-chise.git.1]
/
src
/
ntproc.c
diff --git
a/src/ntproc.c
b/src/ntproc.c
index
029ba1f
..
0b95e43
100644
(file)
--- a/
src/ntproc.c
+++ b/
src/ntproc.c
@@
-400,7
+400,7
@@
reader_thread (void *arg)
static const char * process_dir;
static BOOL
static const char * process_dir;
static BOOL
-create_child (CONST char *exe, char *cmdline, char *env,
+create_child (const char *exe, char *cmdline, char *env,
int * pPid, child_process *cp)
{
STARTUPINFO start;
int * pPid, child_process *cp)
{
STARTUPINFO start;
@@
-487,7
+487,7
@@
rva_to_section (DWORD rva, IMAGE_NT_HEADERS * nt_header)
#endif
void
#endif
void
-win32_executable_type (CONST char * filename, int * is_dos_app, int * is_cygnus_app)
+win32_executable_type (const char * filename, int * is_dos_app, int * is_cygnus_app)
{
file_data executable;
char * p;
{
file_data executable;
char * p;
@@
-533,7
+533,7
@@
win32_executable_type (CONST char * filename, int * is_dos_app, int * is_cygnus_
if (exe_header->e_magic != DOSMAGIC)
goto unwind;
if (exe_header->e_magic != DOSMAGIC)
goto unwind;
- if ((char *) exe_header->e_lfanew > (char *) executable.size)
+ if ((char*) exe_header->e_lfanew > (char*) executable.size)
{
/* Some dos headers (pkunzip) have bogus e_lfanew fields. */
*is_dos_app = TRUE;
{
/* Some dos headers (pkunzip) have bogus e_lfanew fields. */
*is_dos_app = TRUE;
@@
-550,9
+550,9
@@
win32_executable_type (CONST char * filename, int * is_dos_app, int * is_cygnus_
if (dos_header->e_magic != IMAGE_DOS_SIGNATURE)
goto unwind;
if (dos_header->e_magic != IMAGE_DOS_SIGNATURE)
goto unwind;
- nt_header = (PIMAGE_NT_HEADERS) ((char *) dos_header + dos_header->e_lfanew);
+ nt_header = (PIMAGE_NT_HEADERS) ((char*) dos_header + dos_header->e_lfanew);
- if ((char *) nt_header > (char *) dos_header + executable.size)
+ if ((char*) nt_header > (char*) dos_header + executable.size)
{
/* Some dos headers (pkunzip) have bogus e_lfanew fields. */
*is_dos_app = TRUE;
{
/* Some dos headers (pkunzip) have bogus e_lfanew fields. */
*is_dos_app = TRUE;
@@
-571,11
+571,12
@@
win32_executable_type (CONST char * filename, int * is_dos_app, int * is_cygnus_
IMAGE_SECTION_HEADER * section;
section = rva_to_section (import_dir.VirtualAddress, nt_header);
IMAGE_SECTION_HEADER * section;
section = rva_to_section (import_dir.VirtualAddress, nt_header);
- imports = RVA_TO_PTR (import_dir.VirtualAddress, section, executable);
+ imports = (IMAGE_IMPORT_DESCRIPTOR *) RVA_TO_PTR (import_dir.VirtualAddress,
+ section, executable);
for ( ; imports->Name; imports++)
{
for ( ; imports->Name; imports++)
{
- char * dllname = RVA_TO_PTR (imports->Name, section, executable);
+ char *dllname = (char*) RVA_TO_PTR (imports->Name, section, executable);
if (strcmp (dllname, "cygwin.dll") == 0)
{
if (strcmp (dllname, "cygwin.dll") == 0)
{
@@
-630,7
+631,7
@@
merge_and_sort_env (char **envp1, char **envp2, char **new_envp)
*nptr++ = *optr++;
num += optr - envp2;
*nptr++ = *optr++;
num += optr - envp2;
- qsort (new_envp, num, sizeof (char *), compare_env);
+ qsort (new_envp, num, sizeof (char*), compare_env);
*nptr = NULL;
}
*nptr = NULL;
}
@@
-638,8
+639,8
@@
merge_and_sort_env (char **envp1, char **envp2, char **new_envp)
/* When a new child process is created we need to register it in our list,
so intercept spawn requests. */
int
/* When a new child process is created we need to register it in our list,
so intercept spawn requests. */
int
-sys_spawnve (int mode, CONST char *cmdname,
- CONST char * CONST *argv, CONST char *CONST *envp)
+sys_spawnve (int mode, const char *cmdname,
+ const char * const *argv, const char *const *envp)
{
Lisp_Object program, full;
char *cmdline, *env, *parg, **targ;
{
Lisp_Object program, full;
char *cmdline, *env, *parg, **targ;
@@
-681,7
+682,7
@@
sys_spawnve (int mode, CONST char *cmdname,
}
else
{
}
else
{
- (char*)cmdname = alloca (strlen (argv[0]) + 1);
+ cmdname = (char*)alloca (strlen (argv[0]) + 1);
strcpy ((char*)cmdname, argv[0]);
}
UNGCPRO;
strcpy ((char*)cmdname, argv[0]);
}
UNGCPRO;
@@
-689,7
+690,7
@@
sys_spawnve (int mode, CONST char *cmdname,
/* make sure argv[0] and cmdname are both in DOS format */
unixtodos_filename ((char*)cmdname);
/* #### KLUDGE */
/* make sure argv[0] and cmdname are both in DOS format */
unixtodos_filename ((char*)cmdname);
/* #### KLUDGE */
- ((CONST char**)argv)[0] = cmdname;
+ ((const char**)argv)[0] = cmdname;
/* Determine whether program is a 16-bit DOS executable, or a Win32
executable that is implicitly linked to the Cygnus dll (implying it
/* Determine whether program is a 16-bit DOS executable, or a Win32
executable that is implicitly linked to the Cygnus dll (implying it
@@
-703,7
+704,7
@@
sys_spawnve (int mode, CONST char *cmdname,
while leaving the real app name as argv[0]. */
if (is_dos_app)
{
while leaving the real app name as argv[0]. */
if (is_dos_app)
{
- cmdname = alloca (MAXPATHLEN);
+ cmdname = (char*) alloca (MAXPATHLEN);
if (egetenv ("CMDPROXY"))
strcpy ((char*)cmdname, egetenv ("CMDPROXY"));
else
if (egetenv ("CMDPROXY"))
strcpy ((char*)cmdname, egetenv ("CMDPROXY"));
else
@@
-802,7
+803,7
@@
sys_spawnve (int mode, CONST char *cmdname,
}
arglen += strlen (*targ++) + 1;
}
}
arglen += strlen (*targ++) + 1;
}
- cmdline = alloca (arglen);
+ cmdline = (char*) alloca (arglen);
targ = (char**)argv;
parg = cmdline;
while (*targ)
targ = (char**)argv;
parg = cmdline;
while (*targ)
@@
-884,7
+885,7
@@
sys_spawnve (int mode, CONST char *cmdname,
/* and envp... */
arglen = 1;
/* and envp... */
arglen = 1;
- targ = (char**)envp;
+ targ = (char**) envp;
numenv = 1; /* for end null */
while (*targ)
{
numenv = 1; /* for end null */
while (*targ)
{
@@
-898,11
+899,11
@@
sys_spawnve (int mode, CONST char *cmdname,
numenv++;
/* merge env passed in and extra env into one, and sort it. */
numenv++;
/* merge env passed in and extra env into one, and sort it. */
- targ = (char **) alloca (numenv * sizeof (char *));
- merge_and_sort_env ((char**)envp, extra_env, targ);
+ targ = (char **) alloca (numenv * sizeof (char*));
+ merge_and_sort_env ((char**) envp, extra_env, targ);
/* concatenate env entries. */
/* concatenate env entries. */
- env = alloca (arglen);
+ env = (char*) alloca (arglen);
parg = env;
while (*targ)
{
parg = env;
while (*targ)
{
@@
-1100,7
+1101,7
@@
sys_kill (int pid, int sig)
#if 0
/* Sync with FSF Emacs 19.34.6 note: ifdef'ed out in XEmacs */
#if 0
/* Sync with FSF Emacs 19.34.6 note: ifdef'ed out in XEmacs */
-extern int report_file_error (CONST char *, Lisp_Object);
+extern int report_file_error (const char *, Lisp_Object);
#endif
/* The following two routines are used to manipulate stdin, stdout, and
stderr of our child processes.
#endif
/* The following two routines are used to manipulate stdin, stdout, and
stderr of our child processes.