From kde-devel Fri Mar 29 23:25:02 2002 From: Waldo Bastian Date: Fri, 29 Mar 2002 23:25:02 +0000 To: kde-devel Subject: Re: Solaris and gcc-2.95.3 compile failure X-MARC-Message: https://marc.info/?l=kde-devel&m=101744446920628 On Friday 29 March 2002 02:28 pm, David Faure wrote: > On Friday 29 March 2002 23:06, Simon Josefsson wrote: > > -INCLUDES =3D -I$(srcdir)/../../CContLib -I.. > > +INCLUDES =3D -I$(srcdir)/../../CContLib -I$(srcdir)/.. > > > > -kdm_config_LDADD =3D $(LIBRESOLV) > > +kdm_config_LDADD =3D $(LIBRESOLV) $(LIBSOCKET) > > > > +#ifdef USE_SOLARIS > > +/* net/if.h is incompatible with STL on Solaris 2.6 and 2.8, redefin= e > > + map in the header file because we don't need it. -- Simon Josefss= on > > */ +#define map junkmap > > +#endif > > #include > > +#ifdef USE_SOLARIS > > +#undef map > > +#endif > > I applied those three to HEAD. > Waldo might want to apply to the branch too. Done. Cheers, Waldo --=20 bastian@kde.org | SuSE Labs KDE Developer | bastian@suse.com >> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<