summaryrefslogtreecommitdiff
path: root/TAO/utils/catior
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/utils/catior')
-rw-r--r--TAO/utils/catior/Makefile3
-rw-r--r--TAO/utils/catior/catior.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/TAO/utils/catior/Makefile b/TAO/utils/catior/Makefile
index 2ba273a22a2..89b16196f74 100644
--- a/TAO/utils/catior/Makefile
+++ b/TAO/utils/catior/Makefile
@@ -49,9 +49,6 @@ include $(TAO_ROOT)/taoconfig.mk
$(ACE_ROOT)/ace/ACE.h \
$(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index 51028bec5ff..d1783899a61 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -510,7 +510,7 @@ main (int argc, char *argv[])
CORBA::Environment env;
CORBA::ORB_var orb_var = CORBA::ORB_init (argc, argv, "TAO", env);
CORBA::Boolean b;
- char opt;
+ int opt;
while ((opt = get_opt ()) != EOF)
{