$NetBSD: patch-aa,v 1.1.1.1 2007/08/30 00:47:01 jnemeth Exp $ --- src/icqconf.cc.orig 2005-01-27 00:52:47.000000000 +0100 +++ src/icqconf.cc @@ -27,7 +27,11 @@ #include #include -#ifdef __sun__ +#ifdef __NetBSD__ +/* Find out about __NetBSD_Version__ */ +# include +#endif +#if defined(__sun) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)) #include #endif @@ -644,13 +648,13 @@ void icqconf::loadsounds() { switch(rs) { case rscard: - fo << "*\tmsg\tplay " << SHARE_DIR << "/msg.wav" << endl; - fo << "*\turl\tplay " << SHARE_DIR << "/url.wav" << endl; - fo << "*\temail\tplay " << SHARE_DIR << "/email.wav" << endl; - fo << "*\tonline\tplay " << SHARE_DIR << "/online.wav" << endl; - fo << "*\toffline\tplay " << SHARE_DIR << "/offline.wav" << endl; - fo << "*\tsms\tplay " << SHARE_DIR << "/sms.wav" << endl; - break; + fo << "*\tmsg\t" AUDIO_PLAYER " " << SHARE_DIR << "/msg.wav" << endl; + fo << "*\turl\t" AUDIO_PLAYER " " << SHARE_DIR << "/url.wav" << endl; + fo << "*\temail\t" AUDIO_PLAYER " " << SHARE_DIR << "/email.wav" << endl; + fo << "*\tonline\t" AUDIO_PLAYER " " << SHARE_DIR << "/online.wav" << endl; + fo << "*\toffline\t" AUDIO_PLAYER << SHARE_DIR << "/offline.wav" << endl; + fo << "*\tsms\t" AUDIO_PLAYER " " << SHARE_DIR << "/sms.wav" << endl; + break; case rsspeaker: fo << "*\tmsg\t!spk1" << endl; @@ -1433,7 +1437,7 @@ string icqconf::gethttpproxypasswd() con void icqconf::checkdiskspace() { fenoughdiskspace = true; -#ifndef __sun__ +#if !(defined(__sun) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))) struct statfs st; if(!statfs(conf.getdirname().c_str(), &st)) { #else