- port to Cygwin (DLL support, etc.)

[citadel.git] / citadel / room_ops.c

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 4ba90922c19d2528fade3063a2af1ab511688c74..d94fad48d77a8c10e61c6406327de3dee3d7cd4a 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -4,6 +4,11 @@
  * Server functions which perform operations on room objects.
  *
  */
+
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -26,6 +31,7 @@
 #include <errno.h>
 #include "citadel.h"
 #include "server.h"
+#include "dynloader.h"
 #include "database.h"
 #include "config.h"
 #include "room_ops.h"
@@ -354,7 +360,6 @@ void ForEachRoom(void (*CallBack) (struct quickroom *EachRoom, void *out_data),
        struct quickroom qrbuf;
        struct cdbdata *cdbqr;
 
-       cdb_begin_transaction();
        cdb_rewind(CDB_QUICKROOM);
 
        while (cdbqr = cdb_next_item(CDB_QUICKROOM), cdbqr != NULL) {
@@ -367,7 +372,6 @@ void ForEachRoom(void (*CallBack) (struct quickroom *EachRoom, void *out_data),
                if (qrbuf.QRflags & QR_INUSE)
                        (*CallBack)(&qrbuf, in_data);
        }
-       cdb_end_transaction();
 }
 
 
@@ -841,7 +845,6 @@ void cmd_whok(void)
        struct usersupp temp;
        struct cdbdata *cdbus;
 
-       cdb_begin_transaction();
        getuser(&CC->usersupp, CC->curr_user);
        if (CtdlAccessCheck(ac_room_aide)) return;
 
@@ -857,7 +860,6 @@ void cmd_whok(void)
                    )
                        cprintf("%s\n", temp.fullname);
        }
-       cdb_end_transaction();
        cprintf("000\n");
 }
 
@@ -1337,11 +1339,6 @@ unsigned create_room(char *new_room_name,
         */
        if (!really_create) return (qrbuf.QRflags);
 
-       /* cdb_begin_transaction();  commented out because a transaction
-          is already open when creating __CtdlSMTPspoolout__ while
-          initializing serv_smtp.c
-        */
-
        qrbuf.QRnumber = get_new_room_number();
        qrbuf.QRhighest = 0L;   /* No messages in this room yet */
        time(&qrbuf.QRgen);     /* Use a timestamp as the generation number */
@@ -1364,7 +1361,6 @@ unsigned create_room(char *new_room_name,
        lputuser(&CC->usersupp);
 
        /* resume our happy day */
-       /* cdb_end_transaction(); */
        return (qrbuf.QRflags);
 }