fix build for Solaris

[citadel.git] / citadel / routines2.c

diff --git a/citadel/routines2.c b/citadel/routines2.c
index bf81df744ee7b7adc671234548a90a599bff1133..374464cbbc91c95579ad9b7f9faa3f8c9374a357 100644 (file)
--- a/citadel/routines2.c
+++ b/citadel/routines2.c
@@ -44,6 +44,11 @@
 #endif
 #include "screen.h"
 
+/* work around solaris include files */
+#ifdef reg
+#undef reg
+#endif
+
 extern char temp[];
 extern char tempdir[];
 extern char *axdefs[7];
@@ -195,7 +200,12 @@ void updatels(CtdlIPC *ipc)
                r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?
                                 maxmsgnum : highest_msg_read, buf);
        } else {
-               r = CtdlIPCSetLastRead(ipc, maxmsgnum, buf);
+               r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?
+                                maxmsgnum : highest_msg_read, buf);
+/*             r = CtdlIPCSetLastRead(ipc, maxmsgnum, buf); */
+/* This is a quick-and-dirty fix to all msgs becoming new in Mail>.
+ * It will need to be rethought when messages.c is rewritten.
+ */
        }
        if (r / 100 != 2)
                scr_printf("%s\n", buf);