summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2007-01-06 00:15:24 +0000
committerSteve Huston <shuston@riverace.com>2007-01-06 00:15:24 +0000
commit0975d034429e3c2bb3db68a73fcac0ee337948dc (patch)
treecbdbc4a3cfbf3b2271660877a16f742c5ee1b988
parentcdba33425e62a49ab141b6a767b5d11f7c9e9be0 (diff)
downloadATCD-0975d034429e3c2bb3db68a73fcac0ee337948dc.tar.gz
ChangeLogTag:Sat Jan 6 00:06:52 UTC 2007 Steve Huston <shuston@riverace.com>
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/TAO_IDL/driver/drv_preproc.cpp3
2 files changed, 6 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 1575d3fcbfd..07dde51e2be 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jan 6 00:06:52 UTC 2007 Steve Huston <shuston@riverace.com>
+
+ * TAO_IDL/driver/drv_preproc.cpp: Removed the ACE_HAS_WINNT4 block -
+ everything runs on NT4 or up now, even when running TAO IDL for
+ building on Pharlap or CE.
+
Fri Jan 5 22:51:37 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/include/ast_decl.h:
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index bd95dc82e02..297b6225517 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -1308,8 +1308,6 @@ DRV_pre_proc (const char *myfile)
throw FE_Bailout ();
}
-#if !defined (ACE_WIN32) || defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)
-
if (ACE_OS::unlink (t_file) == -1)
{
ACE_ERROR ((LM_ERROR,
@@ -1320,7 +1318,6 @@ DRV_pre_proc (const char *myfile)
idl_global->set_err_count (idl_global->err_count () + 1);
throw FE_Bailout ();
}
-#endif /* ACE_HAS_WINNT4 && ACE_HAS_WINNT4 != 0 */
if (idl_global->compile_flags () & IDL_CF_ONLY_PREPROC)
{