fix build for Solaris

[citadel.git] / citadel / file_ops.c

diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index 7725507cd6585200c93e9e947bb28d385b649e59..7a6a771cd0b7d82907190549b32e7890eb05f457 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -162,7 +162,7 @@ void cmd_movf(char *cmdbuf)
        char newroom[SIZ];
        char buf[SIZ];
        int a;
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
 
        extract(filename, cmdbuf, 0);
        extract(newroom, cmdbuf, 1);
@@ -270,8 +270,8 @@ void cmd_netf(char *cmdbuf)
                return;
        }
        snprintf(outfile, sizeof outfile,
-                "%s/network/spoolin/nsf.%04x.%04x",
-                BBSDIR, getpid(), ++seq);
+                "%s/network/spoolin/nsf.%04lx.%04x",
+                BBSDIR, (long)getpid(), ++seq);
        ofp = fopen(outfile, "a");
        if (ofp == NULL) {
                cprintf("%d internal error\n", ERROR);
@@ -393,7 +393,7 @@ void cmd_oimg(char *cmdbuf)
 {
        char filename[SIZ];
        char pathname[SIZ];
-       struct user usbuf;
+       struct ctdluser usbuf;
        char which_user[USERNAME_SIZE];
        int which_floor;
        int a;
@@ -801,8 +801,8 @@ void cmd_nuop(char *cmdbuf)
        }
 
        snprintf(CC->upl_path, sizeof CC->upl_path,
-                "%s/network/spoolin/%s.%04x.%04x",
-                BBSDIR, CC->net_node, getpid(), ++seq);
+                "%s/network/spoolin/%s.%04lx.%04x",
+                BBSDIR, CC->net_node, (long)getpid(), ++seq);
 
        CC->upload_fp = fopen(CC->upl_path, "r");
        if (CC->upload_fp != NULL) {