From fda3695872b7c344d17dcfb1d99b5d123dd350f5 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 20 Nov 2025 14:22:12 +0100 Subject: [PATCH] os: move MILLI_PER_MIN and MILLI_PER_SECOND to osdep.h Not needed in public SDK, so move them into a private header. Signed-off-by: Enrico Weigelt, metux IT consult --- Xext/dpms.c | 1 + include/misc.h | 2 -- os/osdep.h | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Xext/dpms.c b/Xext/dpms.c index 1a5323cb28..f5f973d370 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -38,6 +38,7 @@ Equipment Corporation. #include "dix/screensaver_priv.h" #include "miext/extinit_priv.h" #include "os/screensaver.h" +#include "os/osdep.h" #include "Xext/geext_priv.h" #include "misc.h" diff --git a/include/misc.h b/include/misc.h index 6bc70076a4..114fb65924 100644 --- a/include/misc.h +++ b/include/misc.h @@ -121,8 +121,6 @@ typedef struct _xReq *xReqPtr; #include /* for bcopy, bzero, and bcmp */ #define NullBox ((BoxPtr)0) -#define MILLI_PER_MIN (1000 * 60) -#define MILLI_PER_SECOND (1000) #undef min #undef max diff --git a/os/osdep.h b/os/osdep.h index fa73c49ad6..5f974f2447 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -91,6 +91,9 @@ extern void FreeOsBuffers(OsCommPtr /*oc */ void CloseDownFileDescriptor(OsCommPtr oc); +#define MILLI_PER_MIN (1000 * 60) +#define MILLI_PER_SECOND (1000) + #include "dix.h" #include "ospoll.h"