modified some files for builing in macosx(ppc)

This commit is contained in:
2013-01-17 14:13:48 +00:00
parent 07d38add5d
commit 4191538b24
6 changed files with 131 additions and 7 deletions

View File

@ -28,6 +28,11 @@
# include <windows.h>
#endif
#if defined(HAVE_CRT_EXTERNS_H)
/* MacOSX/darwin. _NSGetEnviron() */
# include <crt_externs.h>
#endif
#define STRSIZE 4096
#define ARRSIZE 128
@ -410,7 +415,6 @@ static qse_char_t* get_env (qse_env_t* env, const qse_char_t* name, int* free)
return QSE_NULL;
}
#elif defined(QSE_ENV_CHAR_IS_WCHAR)
static qse_wchar_t* get_env (qse_env_t* env, const qse_wchar_t* name, int* free)
{
@ -470,8 +474,13 @@ static qse_wchar_t* get_env (qse_env_t* env, const qse_wchar_t* name, int* free)
static qse_mchar_t* get_env (qse_env_t* env, const qse_mchar_t* name, int* free)
{
#if defined(HAVE_CRT_EXTERNS_H)
qse_mchar_t** p = *(_NSGetEnviron());
#else
extern char** environ;
qse_mchar_t** p = environ;
#endif
if (p)
{
@ -633,8 +642,13 @@ done:
return 0;
#else
#if defined(HAVE_CRT_EXTERNS_H)
qse_mchar_t** p = *(_NSGetEnviron());
#else
extern char** environ;
qse_mchar_t** p = environ;
#endif
if (p)
{

View File

@ -38,6 +38,9 @@
# if defined(HAVE_SPAWN_H)
# include <spawn.h>
# endif
# if defined(HAVE_CRT_EXTERNS_H)
# include <crt_externs.h> /* MacOSX/darwin. _NSGetEnviron() */
# endif
#endif
static qse_ssize_t pio_input (
@ -445,18 +448,30 @@ int qse_pio_init (
posix_spawnattr_t psattr;
qse_pio_pid_t pid;
param_t param;
#if defined(HAVE_CRT_EXTERNS_H)
#define environ (*(_NSGetEnviron()))
#else
extern char** environ;
#endif
#elif defined(QSE_SYSCALL0) && defined(SYS_vfork)
qse_pio_pid_t pid;
param_t param;
#if defined(HAVE_CRT_EXTERNS_H)
#define environ (*(_NSGetEnviron()))
#else
extern char** environ;
#endif
char** envarr;
int highest_fd;
int dummy;
#else
qse_pio_pid_t pid;
param_t param;
#if defined(HAVE_CRT_EXTERNS_H)
#define environ (*(_NSGetEnviron()))
#else
extern char** environ;
#endif
#endif
QSE_MEMSET (pio, 0, QSE_SIZEOF(*pio));