diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-29 22:26:22 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-29 22:26:22 +0000 |
| commit | 39b9bed0a059de46081d72cca1b524797b1f91ae (patch) | |
| tree | 71b080339fabdbae4fec91e9786f98fb36e7b00a | |
| parent | 9fee0e6c48734b6cc42b14f67eb955f1c75f2129 (diff) | |
| download | ATCD-39b9bed0a059de46081d72cca1b524797b1f91ae.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-98b | 3 | ||||
| -rw-r--r-- | ace/OS.h | 20 |
2 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index 33994d7cf50..f4a3001583e 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,5 +1,8 @@ Mon Jun 29 14:48:58 1998 Nanbor Wang <nanbor@cs.wustl.edu> + * ace/OS.h: Added UNICODE macros for non-Win32 platforms. Thanks + to Jeff Greif <jmg@trivida.com> for pointing this out. + * ace/OS.cpp (invoke): Added a return at the end to keep AIX happy. Thanks to CLahey@cccis.com for reporting this. @@ -2783,17 +2783,21 @@ typedef ACE_UINT64 ACE_hrtime_t; # else /* !defined (ACE_WIN32) && !defined (ACE_PSOS) */ +# if (defined (ACE_HAS_UNICODE) && (defined (UNICODE))) +typedef const wchar_t *LPCTSTR; +typedef wchar_t *LPTSTR; +typedef wchar_t TCHAR; +# if !defined (__TEXT) +# define __TEXT(STRING) L##STRING +# endif /* __TEXT */ +# else typedef const char *LPCTSTR; typedef char *LPTSTR; typedef char TCHAR; - -# if !defined (__TEXT) -# if (defined (ACE_HAS_UNICODE) && (defined (UNICODE))) -# define __TEXT(STRING) L##STRING -# else -# define __TEXT(STRING) STRING -# endif /* UNICODE && ACE_HAS_UNICODE */ -# endif /* !defined __TEXT */ +# if !defined (__TEXT) +# define __TEXT(STRING) STRING +# endif /* __TEXT */ +# endif /* ACE_HAS_UNICODE && UNICODE */ # if defined (m88k) # define RUSAGE_SELF 1 |