It seems that the extra complication hurts more than it helps (for
example with OpenBSD).
Some adaptation will be needed for cmake.
# Needed for Mingw-w64
AC_TYPE_LONG_LONG_INT
# Needed for Mingw-w64
AC_TYPE_LONG_LONG_INT
-if test "$ac_cv_type_long_long_int" = yes; then
- AC_CHECK_SIZEOF(long)
- AC_CHECK_SIZEOF(long long)
-fi
### We need iconv for unicode support (Qt4 frontend requires it too)
LYX_USE_INCLUDED_ICONV
### We need iconv for unicode support (Qt4 frontend requires it too)
LYX_USE_INCLUDED_ICONV
# define USE_WCHAR_T
#endif
# define USE_WCHAR_T
#endif
-#ifdef HAVE_LONG_LONG_INT
-#if SIZEOF_LONG_LONG > SIZEOF_LONG
-#define LYX_USE_LONG_LONG
-#endif
-#endif
-
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
template<>
string convert<string>(unsigned long long ull)
{
template<>
string convert<string>(unsigned long long ull)
{
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
template<>
string convert<string>(long long ll)
{
template<>
string convert<string>(long long ll)
{
template<> docstring convert<docstring>(unsigned int ui);
template<> std::string convert<std::string>(unsigned long ul);
template<> docstring convert<docstring>(unsigned long ul);
template<> docstring convert<docstring>(unsigned int ui);
template<> std::string convert<std::string>(unsigned long ul);
template<> docstring convert<docstring>(unsigned long ul);
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
template<> std::string convert<std::string>(unsigned long long ull);
template<> docstring convert<docstring>(unsigned long long ull);
#endif
template<> std::string convert<std::string>(long l);
template<> docstring convert<docstring>(long l);
template<> std::string convert<std::string>(unsigned long long ull);
template<> docstring convert<docstring>(unsigned long long ull);
#endif
template<> std::string convert<std::string>(long l);
template<> docstring convert<docstring>(long l);
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
template<> std::string convert<std::string>(long long ll);
template<> docstring convert<docstring>(long long ll);
#endif
template<> std::string convert<std::string>(long long ll);
template<> docstring convert<docstring>(long long ll);
#endif
{ return toStream(l, t); }
LyXErr & operator<<(LyXErr & l, unsigned long t)
{ return toStream(l, t); }
{ return toStream(l, t); }
LyXErr & operator<<(LyXErr & l, unsigned long t)
{ return toStream(l, t); }
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
LyXErr & operator<<(LyXErr & l, long long t)
{ return toStream(l, t); }
LyXErr & operator<<(LyXErr & l, unsigned long long t)
LyXErr & operator<<(LyXErr & l, long long t)
{ return toStream(l, t); }
LyXErr & operator<<(LyXErr & l, unsigned long long t)
LyXErr & operator<<(LyXErr &, unsigned int);
LyXErr & operator<<(LyXErr &, long);
LyXErr & operator<<(LyXErr &, unsigned long);
LyXErr & operator<<(LyXErr &, unsigned int);
LyXErr & operator<<(LyXErr &, long);
LyXErr & operator<<(LyXErr &, unsigned long);
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
LyXErr & operator<<(LyXErr &, long long);
LyXErr & operator<<(LyXErr &, unsigned long long);
#endif
LyXErr & operator<<(LyXErr &, long long);
LyXErr & operator<<(LyXErr &, unsigned long long);
#endif
return do_put_helper(oit, b, fill, v);
}
return do_put_helper(oit, b, fill, v);
}
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
iter_type
do_put(iter_type oit, ios_base & b, char_type fill, long long v) const
{
iter_type
do_put(iter_type oit, ios_base & b, char_type fill, long long v) const
{
return do_get_integer(iit, eit, b, err, v);
}
return do_get_integer(iit, eit, b, err, v);
}
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
iter_type
do_get(iter_type iit, iter_type eit, ios_base & b,
ios_base::iostate & err, long long & v) const
iter_type
do_get(iter_type iit, iter_type eit, ios_base & b,
ios_base::iostate & err, long long & v) const
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
docstring bformat(docstring const & fmt, long long arg1)
{
LATTEST(contains(fmt, from_ascii("%1$d")));
docstring bformat(docstring const & fmt, long long arg1)
{
LATTEST(contains(fmt, from_ascii("%1$d")));
docstring bformat(docstring const & fmt, int arg1);
docstring bformat(docstring const & fmt, long arg1);
docstring bformat(docstring const & fmt, int arg1);
docstring bformat(docstring const & fmt, long arg1);
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
docstring bformat(docstring const & fmt, long long arg1);
#endif
docstring bformat(docstring const & fmt, unsigned int arg1);
docstring bformat(docstring const & fmt, long long arg1);
#endif
docstring bformat(docstring const & fmt, unsigned int arg1);
template otexrowstream & operator<< <unsigned long>(otexrowstream &,
unsigned long);
template otexrowstream & operator<< <unsigned long>(otexrowstream &,
unsigned long);
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
template otexrowstream & operator<< <unsigned long long>(otexrowstream &,
unsigned long long);
#endif
template otexrowstream & operator<< <unsigned long long>(otexrowstream &,
unsigned long long);
#endif
template otexstream & operator<< <int>(otexstream &, int);
template otexstream & operator<< <unsigned int>(otexstream &, unsigned int);
template otexstream & operator<< <unsigned long>(otexstream &, unsigned long);
template otexstream & operator<< <int>(otexstream &, int);
template otexstream & operator<< <unsigned int>(otexstream &, unsigned int);
template otexstream & operator<< <unsigned long>(otexstream &, unsigned long);
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
template otexstream & operator<< <unsigned long long>(otexstream &, unsigned long long);
#endif
template otexstream & operator<< <unsigned long long>(otexstream &, unsigned long long);
#endif