hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

interim commit

Browse Source 
- fixed wrong qse_pio_hid_t definition
This commit is contained in:
hyung-hwan 2009-01-09 04:48:46 +00:00
parent 86a1d88307
commit 567eaa483b
5 changed files with 118 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qse/include/qse/macros.h
View File

@ -147,20 +147,6 @@
(qse_assert_failed (QSE_T(#expr), QSE_T(desc), QSE_T(__FILE__), __LINE__), 0))
#endif
/****d* ase/QSE_FNS
* NAME
* QSE_FNS - define an ASE function name space
* DESCRIPTION
* The QSE_FNS macro enables you to simulate a function name space for the
* types designed properly.
* EXAMPLE
* QSE_FNS (awk, AWK);
* qse_awk_t* awk = AWK.open (....);
* AWK.close (awk);
******
*/
#define QSE_NS(type,name) struct qse_ns_##type##_t name = qse_ns_##type##_d
#ifdef __cplusplus
# define QSE_BEGIN_NAMESPACE(x) namespace x {
# define QSE_END_NAMESPACE(x) }

25
qse/include/qse/types.h
View File

@ -26,16 +26,6 @@
# include <qse/conf_msw.h>
#elif defined(vms) || defined(__vms)
# include <qse/conf_vms.h>
/*
#elif defined(__unix__) || defined(__unix) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__SPU__)
#if !defined(__unix__)
#define __unix__
#endif
#if !defined(__unix)
#define __unix
#endif
#include <qse/config.h>
*/
#else
# error unsupported operating system
#endif
@ -66,7 +56,8 @@ typedef int qse_tri_t;
* qse_uint_t - define an unsigned integer type as large as a pointer type
******
*/
#if (defined(hpux) || defined(__hpux) || defined(__hpux__)) && (QSE_SIZEOF_VOID_P == QSE_SIZEOF_LONG)
#if (defined(hpux) || defined(__hpux) || defined(__hpux__)) && \
(QSE_SIZEOF_VOID_P == QSE_SIZEOF_LONG)
typedef long qse_int_t;
typedef unsigned long qse_uint_t;
#elif defined(__SPU__) && (QSE_SIZEOF_VOID_P == QSE_SIZEOF_LONG)
@ -205,7 +196,7 @@ typedef int qse_tri_t;
/****t* ase/qse_byte_t
* NAME
* qse_word_t - define a byte type
* qse_byte_t - define a byte type
******
*/
typedef qse_uint8_t qse_byte_t;
@ -264,7 +255,9 @@ typedef int qse_mcint_t;
* qse_wcint_t - define a type that can hold qse_wchar_t and QSE_WCHAR_EOF
******
*/
#if defined(__cplusplus) && (!defined(_MSC_VER) || (defined(_MSC_VER)&&defined(_NATIVE_WCHAR_T_DEFINED)))
#if defined(__cplusplus) && \
(!defined(_MSC_VER) || \
(defined(_MSC_VER) && defined(_NATIVE_WCHAR_T_DEFINED)))
/* C++ */
typedef wchar_t qse_wchar_t;
@ -366,7 +359,7 @@ typedef struct qse_ccls_t qse_ccls_t;
struct qse_xstr_t
{
qse_char_t* ptr; /* this is not a const pointer */
qse_size_t len;
qse_size_t len; /* the number of characters */
};
/******/
@ -379,7 +372,7 @@ struct qse_xstr_t
struct qse_cstr_t
{
const qse_char_t* ptr; /* this is a const pointer */
qse_size_t len;
qse_size_t len; /* the number of characters */
};
/******/
@ -400,7 +393,7 @@ struct qse_mmgr_t
/****t* ase/qse_ccls_type_t
* NAME
* qse_ccls_type_t - define types of character class
* qse_ccls_type_t - define character class types
*
* SYNOPSIS
*/

12
qse/lib/cmn/pio.c
View File

@ -174,6 +174,7 @@ qse_pio_t* qse_pio_init (
if (flags & QSE_PIO_SHELL)
{
const qse_mchar_t* mcmd;
qse_mchar_t* argv[4];
#ifdef QSE_CHAR_IS_MCHAR
mcmd = cmd;
@ -204,7 +205,16 @@ qse_pio_t* qse_pio_init (
n = qse_wcstombs (cmd, mcmd, &mn);
execl ("/bin/sh", "sh", "-c", mcmd, QSE_NULL);
argv[0] = QSE_MT("/bin/sh");
argv[1] = QSE_MT("-c");
argv[2] = mcmd;
argv[3] = QSE_NULL;
/* TODO: */
{
extern char** environ;
QSE_EXECVE (QSE_MT("/bin/sh"), argv, environ);
}
}
else
{

1
qse/test/cmn/pio.c
View File

@ -73,7 +73,6 @@ static int test2 (void)
{
qse_byte_t buf[128];
/*qse_pio_canread (pio, QSE_PIO_ERR, 1000)*/
qse_ssize_t n = qse_pio_read (pio, buf, sizeof(buf), QSE_PIO_ERR);
if (n == 0) break;
if (n < 0)