diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-01 12:00:01 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-01 12:00:01 +0000 |
| commit | d47f4035062b54e92ebf0b6a8d1e1c3fab107fc3 (patch) | |
| tree | 93460245df048797faf87f45abee99e17b9cd8e9 /ACE/ace/config-win32-common.h | |
| parent | b9dd9aafbdc9d16fc2b3f302d0590e88144f61f3 (diff) | |
| download | ATCD-d47f4035062b54e92ebf0b6a8d1e1c3fab107fc3.tar.gz | |
Fri Oct 1 11:55:23 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-g++-common.h:
* ace/config-qnx-neutrino.h:
* ace/config-qnx-rtp-common.h:
Fixed redefinition warnings
* ace/ace_for_tao.mpc:
Zapped some files
* ace/config-win32-common.h:
* ace/config-win32-msvc.h:
* ace/config-win32.h:
Cleanup
* ace/config-win32-ghs.h:
Removed this file.
Diffstat (limited to 'ACE/ace/config-win32-common.h')
| -rw-r--r-- | ACE/ace/config-win32-common.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index 1fedecccdcd..ddfad783c6b 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -300,12 +300,11 @@ #define ACE_MKDIR_LACKS_MODE #define ACE_SIZEOF_LONG_LONG 8 -// Green Hills Native x86 does not support __int64 keyword -// Neither does mingw32. + #if !defined (ACE_LACKS_LONGLONG_T) && !defined (__MINGW32__) #define ACE_INT64_TYPE signed __int64 #define ACE_UINT64_TYPE unsigned __int64 -#endif /* (ghs) */ +#endif #if defined (__MINGW32__) #define ACE_INT64_TYPE signed long long |