diff options
| author | Marc Laukien <marc@zeroc.com> | 2001-09-08 20:04:43 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2001-09-08 20:04:43 +0000 |
| commit | f8fa37b8038c201da65f792c9c8c679cce92da41 (patch) | |
| tree | 79c781f9d954ed8e1dc6c0a0b5934b767b5057a9 /cpp/src | |
| parent | win fixes (diff) | |
| download | ice-f8fa37b8038c201da65f792c9c8c679cce92da41.tar.bz2 ice-f8fa37b8038c201da65f792c9c8c679cce92da41.tar.xz ice-f8fa37b8038c201da65f792c9c8c679cce92da41.zip | |
fixes for windows
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IcePack/Parser.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/IcePack/Parser.h | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/cpp/src/IcePack/Parser.cpp b/cpp/src/IcePack/Parser.cpp index 394fd143def..d6169b9de22 100644 --- a/cpp/src/IcePack/Parser.cpp +++ b/cpp/src/IcePack/Parser.cpp @@ -11,12 +11,6 @@ #include <Ice/Ice.h> #include <IcePack/Parser.h> -#ifdef WIN32 -# include <io.h> -# define isatty _isatty -# define fileno _fileno -#endif - #ifdef HAVE_READLINE # include <readline/readline.h> # include <readline/history.h> diff --git a/cpp/src/IcePack/Parser.h b/cpp/src/IcePack/Parser.h index 628ba2ef940..cd879e9170b 100644 --- a/cpp/src/IcePack/Parser.h +++ b/cpp/src/IcePack/Parser.h @@ -14,6 +14,14 @@ #include <IcePack/Admin.h> #include <list> +#ifdef WIN32 +# include <io.h> +# define isatty _isatty +# define fileno _fileno +// '_isatty' : inconsistent dll linkage. dllexport assumed. +# pragma warning( disable : 4273 ) +#endif + // // Stuff for flex and bison // |