X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel.h;h=3e970484b7b390651e664e6ca223ff369d585313;hb=27d35cf620da260472336afd096787cf5e5558d3;hp=814cf2c3d88c5febfd4c6c92b28f8b31a704ea2c;hpb=b5c27b47802918a480a8749a70ea63b942f60101;p=citadel.git

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 814cf2c3d..3e970484b 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -158,7 +158,7 @@ struct march {
 /*
  * User records.
  */
-struct user {			/* User record                      */
+struct ctdluser {			/* User record                      */
 	int version;			/* Cit vers. which created this rec */
 	uid_t uid;			/* Associate with a unix account?   */
 	char password[32];		/* password (for BBS-only users)    */
@@ -195,7 +195,7 @@ struct CitControl {
 /*
  * Room records.
  */
-struct room {
+struct ctdlroom {
 	char QRname[ROOMNAMELEN];	/* Name of room                     */
 	char QRpasswd[10];		/* Only valid if it's a private rm  */
 	long QRroomaide;		/* User number of room aide         */