--- np2/common/strres.h 2004/01/22 01:10:03 1.5 +++ np2/common/strres.h 2004/06/20 00:56:26 1.10 @@ -3,46 +3,62 @@ extern "C" { #endif -extern const char str_null[]; -extern const char str_space[]; -extern const char str_dot[]; +extern const OEMCHAR str_null[]; +extern const OEMCHAR str_space[]; +extern const OEMCHAR str_dot[]; -extern const char str_cr[]; -extern const char str_crlf[]; +extern const OEMCHAR str_cr[]; +extern const OEMCHAR str_crlf[]; #define str_lf (str_crlf + 1) -extern const char str_ini[]; -extern const char str_cfg[]; -extern const char str_sav[]; -extern const char str_bmp[]; -extern const char str_d88[]; -extern const char str_d98[]; -extern const char str_thd[]; -extern const char str_hdi[]; -extern const char str_hdd[]; - -extern const char str_d[]; -extern const char str_u[]; -extern const char str_x[]; -extern const char str_2d[]; -extern const char str_2x[]; -extern const char str_4x[]; -extern const char str_4X[]; - -extern const char str_false[]; -extern const char str_true[]; - -extern const char str_posx[]; -extern const char str_posy[]; -extern const char str_width[]; -extern const char str_height[]; - -extern const char str_np2[]; -extern const char str_resume[]; - -extern const char str_VM[]; -extern const char str_VX[]; -extern const char str_EPSON[]; +#if defined(OSLINEBREAK_CR) +#define str_oscr str_cr +#elif defined(OSLINEBREAK_CRLF) +#define str_oscr str_crlf +#else +#define str_oscr str_lf +#endif + +extern const OEMCHAR str_ini[]; +extern const OEMCHAR str_cfg[]; +extern const OEMCHAR str_sav[]; +extern const OEMCHAR str_bmp[]; +extern const OEMCHAR str_d88[]; +extern const OEMCHAR str_d98[]; +extern const OEMCHAR str_88d[]; +extern const OEMCHAR str_98d[]; +extern const OEMCHAR str_thd[]; +extern const OEMCHAR str_hdi[]; +extern const OEMCHAR str_fdi[]; +extern const OEMCHAR str_hdd[]; +extern const OEMCHAR str_nhd[]; + +extern const OEMCHAR str_d[]; +extern const OEMCHAR str_u[]; +extern const OEMCHAR str_x[]; +extern const OEMCHAR str_2d[]; +extern const OEMCHAR str_2x[]; +extern const OEMCHAR str_4x[]; +extern const OEMCHAR str_4X[]; + +extern const OEMCHAR str_false[]; +extern const OEMCHAR str_true[]; + +extern const OEMCHAR str_posx[]; +extern const OEMCHAR str_posy[]; +extern const OEMCHAR str_width[]; +extern const OEMCHAR str_height[]; + +extern const OEMCHAR str_np2[]; +extern const OEMCHAR str_resume[]; + +extern const OEMCHAR str_VM[]; +extern const OEMCHAR str_VX[]; +extern const OEMCHAR str_EPSON[]; + +extern const OEMCHAR str_biosrom[]; +extern const OEMCHAR str_sasirom[]; +extern const OEMCHAR str_scsirom[]; #ifdef __cplusplus }