*** empty log message ***
This commit is contained in:
parent
dee681b939
commit
cda47ef0e5
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: conf_dos.h,v 1.4 2006-04-30 18:05:07 bacon Exp $
|
||||
* $Id: conf_dos.h,v 1.5 2006-05-06 16:05:12 bacon Exp $
|
||||
*/
|
||||
|
||||
#if !defined(__LARGE__) && !defined(__HUGE__)
|
||||
@ -26,5 +26,6 @@
|
||||
#define XP_SIZEOF_FLOAT 4
|
||||
#define XP_SIZEOF_DOUBLE 8
|
||||
#define XP_SIZEOF_LONG_DOUBLE 10 /* turbo c 2.01 */
|
||||
#define XP_SIZEOF_WCHAR_T 0
|
||||
|
||||
#define XP_CHAR_IS_MCHAR
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: conf_msw.h,v 1.2 2006-04-30 17:35:37 bacon Exp $
|
||||
* $Id: conf_msw.h,v 1.3 2006-05-06 16:05:12 bacon Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -47,3 +47,4 @@ _M_X64 x64 platform
|
||||
#define XP_SIZEOF_FLOAT 4
|
||||
#define XP_SIZEOF_DOUBLE 8
|
||||
#define XP_SIZEOF_LONG_DOUBLE 16
|
||||
#define XP_SIZEOF_WCHAR_T 2
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: conf_vms.h,v 1.4 2006-04-30 17:35:37 bacon Exp $
|
||||
* $Id: conf_vms.h,v 1.5 2006-05-06 16:05:12 bacon Exp $
|
||||
*/
|
||||
|
||||
/* TODO: please complete the itanium portion */
|
||||
@ -11,6 +11,7 @@
|
||||
#define XP_SIZEOF_SHORT 2
|
||||
#define XP_SIZEOF_INT 4
|
||||
#define XP_SIZEOF_LONG 4
|
||||
|
||||
#if defined(vax) || defined(__vax)
|
||||
#define XP_SIZEOF_LONG_LONG 0
|
||||
#elif defined(alpha) || defined(__alpha)
|
||||
@ -24,6 +25,7 @@
|
||||
#define XP_SIZEOF___INT8 1
|
||||
#define XP_SIZEOF___INT16 2
|
||||
#define XP_SIZEOF___INT32 4
|
||||
|
||||
#if defined(vax) || defined(__vax)
|
||||
#define XP_SIZEOF___INT64 0
|
||||
#elif defined(alpha) || defined(__alpha)
|
||||
@ -33,6 +35,7 @@
|
||||
#else
|
||||
#define XP_SIZEOF___INT64 0
|
||||
#endif
|
||||
|
||||
#define XP_SIZEOF___INT96 0
|
||||
#define XP_SIZEOF___INT128 0
|
||||
|
||||
@ -64,3 +67,5 @@
|
||||
#else
|
||||
#define XP_SIZEOF_LONG_DOUBLE 0
|
||||
#endif
|
||||
|
||||
#define XP_SIZEOF_WCHAR_T 4
|
||||
|
@ -29,6 +29,7 @@
|
||||
#define XP_SIZEOF_DOUBLE 0
|
||||
#define XP_SIZEOF_LONG_DOUBLE 0
|
||||
#define XP_SIZEOF_PID_T 0
|
||||
#define XP_SIZEOF_WCHAR_T 0
|
||||
|
||||
/* fcntl.h */
|
||||
#undef XP_HAVE_FCNTL_H
|
||||
|
5882
ase/configure
vendored
5882
ase/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
AC_PREREQ(2.53)
|
||||
AC_INIT([xpkit], [deb-0.1.0])
|
||||
AC_REVISION([$Revision: 1.64 $])
|
||||
AC_REVISION([$Revision: 1.65 $])
|
||||
AC_CONFIG_HEADER([xp/config.h])
|
||||
|
||||
# Checks for programs.
|
||||
@ -76,6 +76,7 @@ AC_CHECK_SIZEOF(float)
|
||||
AC_CHECK_SIZEOF(double)
|
||||
AC_CHECK_SIZEOF(long double)
|
||||
AC_CHECK_SIZEOF(pid_t)
|
||||
AC_CHECK_SIZEOF(wchar_t)
|
||||
|
||||
AC_DEFINE_UNQUOTED(XP_SIZEOF_CHAR,${ac_cv_sizeof_char})
|
||||
AC_DEFINE_UNQUOTED(XP_SIZEOF_SHORT,${ac_cv_sizeof_short})
|
||||
@ -93,6 +94,7 @@ AC_DEFINE_UNQUOTED(XP_SIZEOF_FLOAT,${ac_cv_sizeof_float})
|
||||
AC_DEFINE_UNQUOTED(XP_SIZEOF_DOUBLE,${ac_cv_sizeof_double})
|
||||
AC_DEFINE_UNQUOTED(XP_SIZEOF_LONG_DOUBLE,${ac_cv_sizeof_long_double})
|
||||
AC_DEFINE_UNQUOTED(XP_SIZEOF_PID_T,${ac_cv_sizeof_pid_t})
|
||||
AC_DEFINE_UNQUOTED(XP_SIZEOF_WCHAR_T,${ac_cv_sizeof_wchar_t})
|
||||
|
||||
#AC_CHECK_FUNC(nanosleep,[AC_DEFINE([XP_HAVE_NANOSLEEP])],
|
||||
# [AC_CHECK_LIB(rt,nanosleep, LIBS="${LIBS} -lrt",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: awk.c,v 1.28 2006-04-30 18:09:47 bacon Exp $
|
||||
* $Id: awk.c,v 1.29 2006-05-06 16:05:12 bacon Exp $
|
||||
*/
|
||||
|
||||
#include <xp/awk/awk.h>
|
||||
@ -9,26 +9,16 @@
|
||||
#include <wchar.h>
|
||||
#endif
|
||||
|
||||
#ifdef __STAND_ALONE
|
||||
#define xp_printf xp_awk_printf
|
||||
extern int xp_awk_printf (const xp_char_t* fmt, ...);
|
||||
#else
|
||||
#ifdef XP_CHAR_IS_MCHAR
|
||||
#define xp_printf printf
|
||||
#else
|
||||
#define xp_printf wprintf
|
||||
#endif
|
||||
#ifndef __STAND_ALONE
|
||||
#include <xp/bas/stdio.h>
|
||||
#include <xp/bas/string.h>
|
||||
#endif
|
||||
|
||||
#ifdef __STAND_ALONE
|
||||
#define xp_strcmp xp_awk_strcmp
|
||||
extern int xp_awk_strcmp (const xp_char_t* s1, const xp_char_t* s2);
|
||||
#else
|
||||
#ifdef XP_CHAR_IS_MCHAR
|
||||
#define xp_strcmp strcmp
|
||||
#else
|
||||
#define xp_strcmp wcscmp
|
||||
#endif
|
||||
#define xp_printf xp_awk_printf
|
||||
extern int xp_awk_printf (const xp_char_t* fmt, ...);
|
||||
#define xp_strcmp xp_awk_strcmp
|
||||
extern int xp_awk_strcmp (const xp_char_t* s1, const xp_char_t* s2);
|
||||
#endif
|
||||
|
||||
static xp_ssize_t process_source (
|
||||
@ -130,14 +120,14 @@ int xp_main (int argc, xp_char_t* argv[])
|
||||
#endif
|
||||
if ((awk = xp_awk_open()) == XP_NULL)
|
||||
{
|
||||
xp_printf (XP_TEXT("Error: cannot open awk\n"));
|
||||
xp_printf (XP_T("Error: cannot open awk\n"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (xp_awk_attsrc(awk, process_source, XP_NULL) == -1)
|
||||
{
|
||||
xp_awk_close (awk);
|
||||
xp_printf (XP_TEXT("Error: cannot attach source\n"));
|
||||
xp_printf (XP_T("Error: cannot attach source\n"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -150,7 +140,7 @@ int xp_main (int argc, xp_char_t* argv[])
|
||||
#if defined(__STAND_ALONE) && !defined(_WIN32)
|
||||
if (strcmp(argv[1], "-m") == 0)
|
||||
#else
|
||||
if (xp_strcmp(argv[1], XP_TEXT("-m")) == 0)
|
||||
if (xp_strcmp(argv[1], XP_T("-m")) == 0)
|
||||
#endif
|
||||
{
|
||||
xp_awk_setrunopt (awk, XP_AWK_RUNMAIN);
|
||||
@ -161,11 +151,11 @@ int xp_main (int argc, xp_char_t* argv[])
|
||||
{
|
||||
#if defined(__STAND_ALONE) && !defined(_WIN32) && defined(XP_CHAR_IS_WCHAR)
|
||||
xp_printf (
|
||||
XP_TEXT("error: cannot parse program - [%d] %ls\n"),
|
||||
XP_T("error: cannot parse program - [%d] %ls\n"),
|
||||
xp_awk_geterrnum(awk), xp_awk_geterrstr(awk));
|
||||
#else
|
||||
xp_printf (
|
||||
XP_TEXT("error: cannot parse program - [%d] %s\n"),
|
||||
XP_T("error: cannot parse program - [%d] %s\n"),
|
||||
xp_awk_geterrnum(awk), xp_awk_geterrstr(awk));
|
||||
#endif
|
||||
xp_awk_close (awk);
|
||||
@ -176,11 +166,11 @@ int xp_main (int argc, xp_char_t* argv[])
|
||||
{
|
||||
#if defined(__STAND_ALONE) && !defined(_WIN32) && defined(XP_CHAR_IS_WCHAR)
|
||||
xp_printf (
|
||||
XP_TEXT("error: cannot run program - [%d] %ls\n"),
|
||||
XP_T("error: cannot run program - [%d] %ls\n"),
|
||||
xp_awk_geterrnum(awk), xp_awk_geterrstr(awk));
|
||||
#else
|
||||
xp_printf (
|
||||
XP_TEXT("error: cannot run program - [%d] %s\n"),
|
||||
XP_T("error: cannot run program - [%d] %s\n"),
|
||||
xp_awk_geterrnum(awk), xp_awk_geterrstr(awk));
|
||||
#endif
|
||||
xp_awk_close (awk);
|
||||
|
22
ase/types.h
22
ase/types.h
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: types.h,v 1.46 2006-05-06 12:52:36 bacon Exp $
|
||||
* $Id: types.h,v 1.47 2006-05-06 16:05:12 bacon Exp $
|
||||
*/
|
||||
|
||||
#ifndef _XP_TYPES_H_
|
||||
@ -208,26 +208,28 @@ typedef xp_uint_t xp_word_t;
|
||||
typedef char xp_mchar_t;
|
||||
typedef int xp_mcint_t;
|
||||
|
||||
#ifdef __cplusplus
|
||||
#if defined(__cplusplus)
|
||||
/* C++ */
|
||||
typedef wchar_t xp_wchar_t;
|
||||
typedef wchar_t xp_wcint_t;
|
||||
#else
|
||||
/* C */
|
||||
#if defined(_WIN32)
|
||||
|
||||
/* C all the way down here */
|
||||
#elif (XP_SIZEOF_WCHAR_T == 2) || (XP_SIZEOF_WCHAR_T == 0)
|
||||
typedef unsigned short xp_wchar_t;
|
||||
typedef unsigned short xp_wcint_t;
|
||||
#elif defined(vms) || defined(__vms)
|
||||
#elif (XP_SIZEOF_WCHAR_T == 4)
|
||||
#if defined(vms) || defined(__vms)
|
||||
typedef long xp_wchar_t;
|
||||
typedef long xp_wcint_t;
|
||||
#elif XP_SIZEOF_LONG == 4
|
||||
#elif XP_SIZEOF_LONG == 4
|
||||
typedef long xp_wchar_t;
|
||||
typedef long xp_wcint_t;
|
||||
#else
|
||||
#else
|
||||
typedef int xp_wchar_t;
|
||||
typedef int xp_wcint_t;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#else
|
||||
#error unsupported size of wchar_t
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && (defined(UNICODE)||defined(_UNICODE))
|
||||
|
Loading…
Reference in New Issue
Block a user