6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-08-13 08:25:28 +00:00
Code Issues Projects Releases Wiki Activity

Support both MinGW and MinGW-w64.

Browse Source
This commit is contained in:
Oliver Schmidt
2014-03-05 22:28:38 +01:00
parent 0f6564cb4e
commit ee9c42bbf5
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cl65/main.c
View File

@@ -41,8 +41,20 @@
#else #else
# define NEED_SPAWN 1 # define NEED_SPAWN 1
#endif #endif
#if defined(_MSC_VER)
# pragma warning(disable : 4996) /* GCC strictly follows http://c-faq.com/ansi/constmismatch.html and issues an
* 'incompatible pointer type' warning - that can't be suppressed via #pragma.
* The spawnvp() prototype of MinGW (http://www.mingw.org/) differs from the
* one of MinGW-w64 (http://mingw-w64.sourceforge.net/) regarding constness.
* So there's no alternative to actually distinguish these environments :-(
*/
#define SPAWN_ARGV_CONST_CAST
#if defined(__MINGW32__)
# include <_mingw.h>
# if !defined(__MINGW64_VERSION_MAJOR)
# undef SPAWN_ARGV_CONST_CAST
# define SPAWN_ARGV_CONST_CAST (const char* const *)
# endif
#endif #endif
@@ -375,7 +387,7 @@ static void ExecProgram (CmdDesc* Cmd)
} }
/* Call the program */ /* Call the program */
Status = spawnvp (P_WAIT, Cmd->Name, (const char* const *) Cmd->Args); Status = spawnvp (P_WAIT, Cmd->Name, SPAWN_ARGV_CONST_CAST Cmd->Args);
/* Check the result code */ /* Check the result code */
if (Status < 0) { if (Status < 0) {

2
src/cl65/spawn-amiga.inc
View File

@@ -54,7 +54,7 @@
int spawnvp (int Mode attribute ((unused)), int spawnvp (int Mode attribute ((unused)),
const char* File attribute ((unused)), const char* File attribute ((unused)),
const char* const argv []) char* const argv [])
/* Execute the given program searching and wait til it terminates. The Mode /* Execute the given program searching and wait til it terminates. The Mode
* argument is ignored (compatibility only). The result of the function is * argument is ignored (compatibility only). The result of the function is
* the return code of the program. The function will terminate the program * the return code of the program. The function will terminate the program

4
src/cl65/spawn-unix.inc
View File

@@ -62,7 +62,7 @@
int spawnvp (int Mode attribute ((unused)), const char* File, const char* const argv []) int spawnvp (int Mode attribute ((unused)), const char* File, char* const argv [])
/* Execute the given program searching and wait til it terminates. The Mode /* Execute the given program searching and wait til it terminates. The Mode
* argument is ignored (compatibility only). The result of the function is * argument is ignored (compatibility only). The result of the function is
* the return code of the program. The function will terminate the program * the return code of the program. The function will terminate the program
@@ -81,7 +81,7 @@ int spawnvp (int Mode attribute ((unused)), const char* File, const char* const
} else if (pid == 0) { } else if (pid == 0) {
/* The son - exec the program */ /* The son - exec the program */
if (execvp (File, (char* const *) argv) < 0) { if (execvp (File, argv) < 0) {
Error ("Cannot exec `%s': %s", File, strerror (errno)); Error ("Cannot exec `%s': %s", File, strerror (errno));
} }