old gnutlsxx defect still not fixed?

[Simon Josefsson]

FYI,

I've not been able to build the C++ library using MinGW because of this
problem:

/bin/bash ../libtool --tag=CXX   --mode=compile i586-mingw32msvc-g++ -DHAVE_CONFIG_H -I. -I../../../src/gnutls-2.3.10/lib -I..  -DLOCALEDIR=\"/home/jas/gnutls4win/inst/share/locale\" -I../../../src/gnutls-2.3.10/lgl -I../lgl -I../../../src/gnutls-2.3.10/includes -I../includes -I../../../src/gnutls-2.3.10/lib/x509 -I../../../src/gnutls-2.3.10/libextra -I../../../src/gnutls-2.3.10/lib/openpgp/ -I/home/jas/gnutls4win/inst/include -I../../../src/gnutls-2.3.10/lib/opencdk -I../../../src/gnutls-2.3.10/lib/opencdk  -I/home/jas/gnutls4win/inst/include  -I../../../src/gnutls-2.3.10/includes/ -g -O2 -MT gnutlsxx.lo -MD -MP -MF .deps/gnutlsxx.Tpo -c -o gnutlsxx.lo ../../../src/gnutls-2.3.10/lib/gnutlsxx.cpp
 i586-mingw32msvc-g++ -DHAVE_CONFIG_H -I. -I../../../src/gnutls-2.3.10/lib -I.. -DLOCALEDIR=\"/home/jas/gnutls4win/inst/share/locale\" -I../../../src/gnutls-2.3.10/lgl -I../lgl -I../../../src/gnutls-2.3.10/includes -I../includes -I../../../src/gnutls-2.3.10/lib/x509 -I../../../src/gnutls-2.3.10/libextra -I../../../src/gnutls-2.3.10/lib/openpgp/ -I/home/jas/gnutls4win/inst/include -I../../../src/gnutls-2.3.10/lib/opencdk -I../../../src/gnutls-2.3.10/lib/opencdk -I/home/jas/gnutls4win/inst/include -I../../../src/gnutls-2.3.10/includes/ -g -O2 -MT gnutlsxx.lo -MD -MP -MF .deps/gnutlsxx.Tpo -c ../../../src/gnutls-2.3.10/lib/gnutlsxx.cpp  -DDLL_EXPORT -DPIC -o .libs/gnutlsxx.o
In file included from /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/include/c++/ctime:51,
                 from /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/include/c++/cwchar:52,
                 from /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/include/c++/bits/postypes.h:46,
                 from /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/include/c++/iosfwd:49,
                 from /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/include/c++/bits/stl_algobase.h:70,
                 from /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/include/c++/vector:66,
                 from ../../../src/gnutls-2.3.10/includes/gnutls/gnutlsxx.h:5,
                 from ../../../src/gnutls-2.3.10/lib/gnutlsxx.cpp:1:
../lgl/time.h:74: error: expected ',' or '...' before '__timer'
../lgl/time.h:76: error: expected ',' or '...' before '__timer'
make[3]: *** [gnutlsxx.lo] Error 1
make[3]: Leaving directory `/home/jas/gnutls4win/build/gnutls-2.3.10/lib'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/jas/gnutls4win/build/gnutls-2.3.10/lib'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/jas/gnutls4win/build/gnutls-2.3.10'
make: *** [all] Error 2
jas at mocca:~/gnutls4win/build/gnutls-2.3.10$ 

Any ideas?

It may be that the 'restrict' keyword isn't understood by g++.  Any
ideas how to solve it?  Possibly gnulib's -I../lgl/ shouldn't be used
for the C++ library?  Yeah, this seems to do the trick:

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 660782c..624263a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -146,6 +146,8 @@ endif
 # C++ library
 
 if ENABLE_CXX
+libgnutlsxx_la_CPPFLAGS = -I$(top_srcdir)/includes -I../includes
+
 CPP_OBJECTS = gnutlsxx.cpp
 
 AM_CXXFLAGS = -I$(top_srcdir)/includes/

I'm pushing it.

/Simon