diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-10-31 15:54:21 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-10-31 15:54:21 -0400 |
| commit | 107e03ea13e0eba9c33f120f0d95ac9fefc7dcad (patch) | |
| tree | 00191b7ccb83fe436ad61bdbb43b523f431c6698 /cpp/include/IceBox/Config.h | |
| parent | Update 3.7 changelog (diff) | |
| download | ice-107e03ea13e0eba9c33f120f0d95ac9fefc7dcad.tar.bz2 ice-107e03ea13e0eba9c33f120f0d95ac9fefc7dcad.tar.xz ice-107e03ea13e0eba9c33f120f0d95ac9fefc7dcad.zip | |
Replaced slice compiler options --ice, --underscore and --dll-export by
global metadata directives (ice-prefix, underscore, cpp:dll-export:SYMBOL and objc:dll-export:SYMBOL)
Added new cs:tie and java:tie metadata
Diffstat (limited to 'cpp/include/IceBox/Config.h')
| -rw-r--r-- | cpp/include/IceBox/Config.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/include/IceBox/Config.h b/cpp/include/IceBox/Config.h index 2c929a8c3e7..041f09b91d7 100644 --- a/cpp/include/IceBox/Config.h +++ b/cpp/include/IceBox/Config.h @@ -7,18 +7,18 @@ // // ********************************************************************** -#ifndef ICE_BOX_CONFIG_H -#define ICE_BOX_CONFIG_H +#ifndef ICEBOX_CONFIG_H +#define ICEBOX_CONFIG_H // // Automatically link with IceBox[D|++11|++11D].lib // -#if !defined(ICE_BUILDING_ICE_BOX) && defined(ICE_BOX_API_EXPORTS) -# define ICE_BUILDING_ICE_BOX +#if !defined(ICE_BUILDING_ICEBOX) && defined(ICEBOX_API_EXPORTS) +# define ICE_BUILDING_ICEBOX #endif -#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICE_BOX) +#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICEBOX) # pragma comment(lib, ICE_LIBNAME("IceBox")) #endif |