summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2017-07-22 10:58:56 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2017-07-22 10:58:56 +0200
commit57a259145f618ab392b70b444aadb2d475fc9e26 (patch)
tree79840d90f46940a4bdd7b417fdc03c9305f70b47 /TAO/tao
parent7c369015bc6ed328e15fe0aac76831574cf452a1 (diff)
parentde9a4ae2da509511f8df97c22cc1317021adeb4f (diff)
downloadATCD-57a259145f618ab392b70b444aadb2d475fc9e26.tar.gz
Merge branch 'master' into jwi-transportselectionguard
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/orbconf.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 411a90866cd..56311856c82 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -202,15 +202,6 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
#define TAO_HAS_EXCEPTIONS
-// BC++ seems to have a different convention for detecting Win32 than
-// VC++.
-
-#if defined (__WIN32__)
-# if !defined(_WIN32)
-# define _WIN32
-# endif /* !defined(_WIN32) */
-#endif /* __WIN32__ */
-
// Define if your processor does not store words with the most significant
// byte first.
@@ -226,15 +217,6 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
the value = 0 */
#endif /* ! ACE_LITTLE_ENDIAN */
-// Define as the return type of signal handlers (int or void).
-#define RETSIGTYPE void
-
-// Define if you don't have vprintf but do have _doprnt.
-/* #undef HAVE_DOPRNT */
-
-// Define if you have the vprintf function.
-#define HAVE_VPRINTF 1
-
// Comment out to enable only ACE monitors...
#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
# define TAO_HAS_MONITOR_FRAMEWORK 1