From d9f63c94f0fd703eb2639a379ad3b1160708a68e Mon Sep 17 00:00:00 2001 From: deskull Date: Sun, 2 Jun 2019 20:57:59 +0900 Subject: [PATCH 1/1] =?utf8?q?[Refactor]=20#37353=20getuid(),=20geteuid()?= =?utf8?q?=20=E5=AE=9A=E7=BE=A9=E3=82=92=20util.h=20=E3=81=B8=E7=A7=BB?= =?utf8?q?=E5=8B=95=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/defines.h | 10 ---------- src/util.h | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/defines.h b/src/defines.h index 5bf9b4bcc..0fb13a9ff 100644 --- a/src/defines.h +++ b/src/defines.h @@ -278,16 +278,6 @@ ((bool)((A)->ml && (!ignore_unview || p_ptr->inside_battle || \ (player_can_see_bold((A)->fy, (A)->fx) && projectable(p_ptr->y, p_ptr->x, (A)->fy, (A)->fx))))) -/* - * Hack -- Prepare to use the "Secure" routines - */ -#if defined(SET_UID) && defined(SECURE) -extern int PlayerUID; -# define getuid() PlayerUID -# define geteuid() PlayerUID -#endif - - /*** Color constants ***/ diff --git a/src/util.h b/src/util.h index 01d6027c7..b309cb0b6 100644 --- a/src/util.h +++ b/src/util.h @@ -1,5 +1,14 @@ #pragma once +/* + * Hack -- Prepare to use the "Secure" routines + */ +#if defined(SET_UID) && defined(SECURE) +extern int PlayerUID; +# define getuid() PlayerUID +# define geteuid() PlayerUID +#endif + #define KEYMAP_MODE_ORIG 0 /*!< ƒIƒŠƒWƒiƒ‹ƒL[”z’u / Mode for original keyset commands */ #define KEYMAP_MODE_ROGUE 1 /*!< ƒ[ƒOƒ‰ƒCƒNƒL[”z’u / Mode for roguelike keyset commands */ #define KEYMAP_MODES 2 /*!< ƒL[”z’u‚̐” / Number of keymap modes */ -- 2.11.0