Aenderungen fuer wieder funktionierendes strict_types
- Deklarative Casts hinzugefuegt
- Typen gefixt
Change-Id: I44c6082d907efb241a35da248774809054f8c5ab
diff --git a/sys/magier.h b/sys/magier.h
index 544bcc7..5936311 100644
--- a/sys/magier.h
+++ b/sys/magier.h
@@ -30,9 +30,9 @@
#define FILE_DELETED "%s wurde geloescht.\n"
#define NO_DELETE "%s konnte nicht geloescht werden.\n"
-#define MAY_READ(x) call_other(__MASTER_OBJECT__,"valid_read",x,getuid(this_object()))
-#define MAY_WRITE(x) call_other(__MASTER_OBJECT__,"valid_write",x,getuid(this_object()))
-#define MAY_DELETE(x) call_other(__MASTER_OBJECT__,"remove_file",x,getuid(this_object()))
+#define MAY_READ(x) ({mixed})call_other(__MASTER_OBJECT__,"valid_read",x,getuid(this_object()))
+#define MAY_WRITE(x) ({mixed})call_other(__MASTER_OBJECT__,"valid_write",x,getuid(this_object()))
+#define MAY_DELETE(x) ({mixed})call_other(__MASTER_OBJECT__,"remove_file",x,getuid(this_object()))
#define MAXLEN 50000
diff --git a/sys/pager.h b/sys/pager.h
index fef652a..f30e749 100644
--- a/sys/pager.h
+++ b/sys/pager.h
@@ -51,9 +51,9 @@
#include <player/base.h>
#define PAGELENGTH (this_interactive() ? \
- this_interactive()->QueryProp(P_SCREENSIZE) : \
+ ({int})this_interactive()->QueryProp(P_SCREENSIZE) : \
(interactive(this_player()) ? \
- this_player()->QueryProp(P_SCREENSIZE) : 20))
+ ({int})this_player()->QueryProp(P_SCREENSIZE) : 20))
// old_explode() must create an array that implode()'s to the same string
#define Explode(s,x) (explode(s,x))