[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kmail-devel
Subject:    Patches for kmail/kmailcvt to allow compilation on FreeBSD 4.x
From:       Andy Fawcett <tap () kde ! org>
Date:       2002-12-30 21:10:24
[Download RAW message or body]

Hi,

After some discussion with Lauri, who had a problem where PATH_MAX could 
not be found while building kmail and kmailcvt from HEAD, I've put 
together the following patches which solve the problem for her. I've 
also tested them on FreeBSD 5.0 and Linux 2.4.x where they apply and 
build okay.

The core of the patch is to include <sys/param.h> if it is available, as 
I noted that on the three platforms I could build on, this file 
includes the necessary header with the definition of PATH_MAX. By 
including this one conditionally, it should not break things anywhere, 
and it saves having conditional compilation dependent on the build OS.

Please review and commit them if they do not cause further problems.

Regards,

Andy

-- 
Andy Fawcett                                     | andy@athame.co.uk
                                                 | tap@kde.org
"In an open world without walls and fences,      | tap@lspace.org
  we wouldn't need Windows and Gates."  -- anon  | tap@fruitsalad.org

["kmfoldermaildir.cpp.patch" (text/x-diff)]

Index: kmfoldermaildir.cpp
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmfoldermaildir.cpp,v
retrieving revision 1.45
diff -u -5 -p -d -r1.45 kmfoldermaildir.cpp
--- kmfoldermaildir.cpp	26 Dec 2002 10:18:14 -0000	1.45
+++ kmfoldermaildir.cpp	30 Dec 2002 16:45:14 -0000
@@ -25,10 +25,13 @@
 #include <dirent.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#if defined(HAVE_SYS_PARAM_H)
+#include <sys/param.h>
+#endif
 #include <unistd.h>
 #include <assert.h>
 
 #ifndef isblank
 #  define isblank(x) ((x)==' '||(x)=='\t')

["filter_oe4.cxx.patch" (text/x-diff)]

Index: filter_oe4.cxx
===================================================================
RCS file: /home/kde/kdenetwork/kmailcvt/filter_oe4.cxx,v
retrieving revision 1.8
diff -u -5 -p -d -r1.8 filter_oe4.cxx
--- filter_oe4.cxx	15 Dec 2002 13:57:39 -0000	1.8
+++ filter_oe4.cxx	30 Dec 2002 16:47:23 -0000
@@ -24,10 +24,13 @@
 #include "harray.hxx"
 
 #include <kfiledialog.h>
 #include <stdlib.h>
 #include <sys/types.h>
+#if defined(HAVE_SYS_PARAM_H)
+#include <sys/param.h>
+#endif
 #include <dirent.h>
 #include <klocale.h>
 
 filter_oe4::filter_oe4() : filter(i18n("Import Folders From Outlook Express \
4"),"Stephan B. Nedregard/Hans Dijkema")  {


["filter_oe5.cxx.patch" (text/x-diff)]

Index: filter_oe5.cxx
===================================================================
RCS file: /home/kde/kdenetwork/kmailcvt/filter_oe5.cxx,v
retrieving revision 1.8
diff -u -5 -p -d -r1.8 filter_oe5.cxx
--- filter_oe5.cxx	15 Dec 2002 13:57:39 -0000	1.8
+++ filter_oe5.cxx	30 Dec 2002 16:48:31 -0000
@@ -23,10 +23,13 @@
 #include "oe5_2mbox.h"
 #include "harray.hxx"
 
 #include <stdlib.h>
 #include <sys/types.h>
+#if defined(HAVE_SYS_PARAM_H)
+#include <sys/param.h>
+#endif
 #include <dirent.h>
 
 #include <qdir.h>
 
 #include <klocale.h>

_______________________________________________
KMail Developers mailing list
kmail@mail.kde.org
http://mail.kde.org/mailman/listinfo/kmail

[prev in list] [next in list] [prev in thread] [next in thread]