David Thompson wrote:
> 
> 
> STRSTREA_H and STRSTREAM_H are not the same. On older Windows systems 
> with limitations on 8.3 character names, these files were not the same. 
> As long as nobody is compiling for Windows 95 or lower, this fix would 
> be acceptable. But since it is not harming anything, I don't see a 
> reason not to leave it in for the time being.

The patch respects the differences between STRSTREA_H and STRSTREAM_H.
It only reduces following trivial cases

In src/uipp/prompter/GARApplication.h:
#if defined(HAVE_SSTREAM)
#include <sstream>
#elif defined(HAVE_STRSTREAM_H)
#include <strstream.h>
#endif

#if defined(HAVE_STRSTREA_H)
#include <strstrea.h>
#endif

This should merge into
#if defined(HAVE_SSTREAM)
#include <sstream>
#elif defined(HAVE_STRSTREAM_H)
#include <strstream.h>
#elif defined(HAVE_STRSTREA_H)
#include <strstrea.h>
#endif

--------------------------------------------------

and in src/uipp/startup/StartupApplication.h:
#if defined(HAVE_SSTREAM)
#include <sstream>
#elif defined(HAVE_STRSTREAM_H)
#include <strstream.h>
#elif defined(HAVE_STRSTREA_H)
#include <strstrea.h>
#endif

#if defined(HAVE_STRSTREA_H)
#include <strstrea.h>
#endif

Where the last #if is redundant.

Rob.

Reply via email to