From: Tom C. <tom...@us...> - 2006-02-09 05:10:03
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16825 Modified Files: Tag: stable-1_2 ChangeLog user.c auth.c Log Message: Include vpopmail.h before qmailadmin.h so we can always redefine MAX_BUFF. Index: user.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v retrieving revision 1.11.2.12 retrieving revision 1.11.2.13 diff -u -d -r1.11.2.12 -r1.11.2.13 --- user.c 5 Feb 2006 16:49:08 -0000 1.11.2.12 +++ user.c 9 Feb 2006 05:09:53 -0000 1.11.2.13 @@ -29,6 +29,7 @@ #include <dirent.h> #include <errno.h> #include <vpopmail_config.h> +#include "vpopmail.h" /* undef some macros that get redefined in config.h below */ #undef PACKAGE_NAME #undef PACKAGE_STRING @@ -45,7 +46,6 @@ #include "template.h" #include "user.h" #include "util.h" -#include "vpopmail.h" #include "vauth.h" Index: auth.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/auth.c,v retrieving revision 1.3.2.5 retrieving revision 1.3.2.6 diff -u -d -r1.3.2.5 -r1.3.2.6 --- auth.c 23 Jan 2005 17:35:11 -0000 1.3.2.5 +++ auth.c 9 Feb 2006 05:09:53 -0000 1.3.2.6 @@ -26,9 +26,9 @@ #include <pwd.h> #include <dirent.h> #include "config.h" +#include <vpopmail.h> #include "qmailadmin.h" #include "qmailadminx.h" -#include <vpopmail.h> #include <vauth.h> #include "cgi.h" #include "show.h" Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.82 retrieving revision 1.15.2.83 diff -u -d -r1.15.2.82 -r1.15.2.83 --- ChangeLog 9 Feb 2006 05:02:55 -0000 1.15.2.82 +++ ChangeLog 9 Feb 2006 05:09:53 -0000 1.15.2.83 @@ -16,7 +16,8 @@ deleting an alias, return to the page that alias would have been on. This feature was sponsored by Marko Lerota. [894823, 877895] - qmailadmin.h: undef MAX_BUFF if previously defined (too small) by - vpopmail.h. + vpopmail.h. Include vpopmail.h before qmailadmin.h so we can + always redefine MAX_BUFF. 1.2.9 - released 1-Sep-05 |