Recovered from cvs revision 2007-05-17 03:03:00

This commit is contained in:
2007-05-18 01:21:00 +00:00
parent b564cc2d8a
commit a4d7743175
10 changed files with 425 additions and 250 deletions

View File

@ -1,5 +1,5 @@
/*
* $Id: main.c,v 1.3 2007/04/30 08:32:50 bacon Exp $
* $Id: main.c,v 1.5 2007/05/16 09:28:33 bacon Exp $
*
* {License}
*/
@ -10,19 +10,18 @@
#include <string.h>
#include <locale.h>
#if !defined(_WIN32) && defined(ASE_CHAR_IS_MCHAR)
#if defined(_WIN32)
int main (int argc, char* argv[], char** envp)
int ase_runmain (int argc, ase_achar_t* argv[], int(*mf) (int,ase_char_t*[]))
{
setlocale (LC_ALL, "");
return ase_main (argc, argv, envp);
return mf (argc, argv);
}
#elif !defined(_WIN32) && defined(ASE_CHAR_IS_WCHAR)
#elif defined(ASE_CHAR_IS_WCHAR)
#include <wchar.h>
int main (int argc, char* argv[]/*, char** envp*/)
int ase_runmain (int argc, ase_achar_t* argv[], int(*mf) (int,ase_char_t*[]))
{
int i, ret;
ase_char_t** v;
@ -73,7 +72,8 @@ int main (int argc, char* argv[]/*, char** envp*/)
}
/* TODO: envp... */
ret = ase_main (argc, v, NULL);
//ret = mf (argc, v, NULL);
ret = mf (argc, v);
exit_main:
for (i = 0; i < argc; i++)
@ -86,4 +86,3 @@ exit_main:
}
#endif

View File

@ -1,5 +1,5 @@
/*
* $Id: main.h,v 1.4 2007/05/06 08:05:36 bacon Exp $
* $Id: main.h,v 1.5 2007/05/16 09:14:10 bacon Exp $
*/
#ifndef _ASE_UTL_MAIN_H_
@ -9,18 +9,23 @@
#include <ase/cmn/macros.h>
#if defined(_WIN32)
#include <tchar.h>
#define ase_main _tmain
typedef ase_char_t ase_achar_t;
#else
#define ase_main main
typedef ase_mchar_t ase_achar_t;
#endif
#ifdef __cplusplus
/*extern "C" { int ase_main (...); }*/
#else
extern int ase_main ();
#endif
#ifdef __cplusplus
extern "C" {
#endif
int ase_runmain (int argc, ase_achar_t* argv[], int(*mf) (int,ase_char_t*[]));
#ifdef __cplusplus
}
#endif
#endif