From 41d0d615f5f04e7e055b853545b08381adc0988e Mon Sep 17 00:00:00 2001
From: fincs <fincs@devkitpro.org>
Date: Wed, 1 Jul 2020 00:20:42 +0200
Subject: [PATCH] ndm: Add NDM_ prefix to enum members in order to avoid name
 collisions

---
 libctru/include/3ds/services/ndm.h | 64 +++++++++++++++---------------
 libctru/source/services/uds.c      |  2 +-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/libctru/include/3ds/services/ndm.h b/libctru/include/3ds/services/ndm.h
index 5e5c424..eb4c80d 100644
--- a/libctru/include/3ds/services/ndm.h
+++ b/libctru/include/3ds/services/ndm.h
@@ -6,54 +6,54 @@
 
 /// Exclusive states.
 typedef enum {
-	EXCLUSIVE_STATE_NONE = 0,
-	EXCLUSIVE_STATE_INFRASTRUCTURE = 1,
-	EXCLUSIVE_STATE_LOCAL_COMMUNICATIONS = 2,
-	EXCLUSIVE_STATE_STREETPASS = 3,
-	EXCLUSIVE_STATE_STREETPASS_DATA = 4,
+	NDM_EXCLUSIVE_STATE_NONE = 0,
+	NDM_EXCLUSIVE_STATE_INFRASTRUCTURE = 1,
+	NDM_EXCLUSIVE_STATE_LOCAL_COMMUNICATIONS = 2,
+	NDM_EXCLUSIVE_STATE_STREETPASS = 3,
+	NDM_EXCLUSIVE_STATE_STREETPASS_DATA = 4,
 } ndmExclusiveState;
 
 /// Current states.
 typedef enum {
-	STATE_INITIAL = 0,
-	STATE_SUSPENDED = 1,
-	STATE_INFRASTRUCTURE_CONNECTING = 2,
-	STATE_INFRASTRUCTURE_CONNECTED = 3,
-	STATE_INFRASTRUCTURE_WORKING = 4,
-	STATE_INFRASTRUCTURE_SUSPENDING = 5,
-	STATE_INFRASTRUCTURE_FORCE_SUSPENDING = 6,
-	STATE_INFRASTRUCTURE_DISCONNECTING = 7,
-	STATE_INFRASTRUCTURE_FORCE_DISCONNECTING = 8,
-	STATE_CEC_WORKING = 9,
-	STATE_CEC_FORCE_SUSPENDING = 10,
-	STATE_CEC_SUSPENDING = 11,
+	NDM_STATE_INITIAL = 0,
+	NDM_STATE_SUSPENDED = 1,
+	NDM_STATE_INFRASTRUCTURE_CONNECTING = 2,
+	NDM_STATE_INFRASTRUCTURE_CONNECTED = 3,
+	NDM_STATE_INFRASTRUCTURE_WORKING = 4,
+	NDM_STATE_INFRASTRUCTURE_SUSPENDING = 5,
+	NDM_STATE_INFRASTRUCTURE_FORCE_SUSPENDING = 6,
+	NDM_STATE_INFRASTRUCTURE_DISCONNECTING = 7,
+	NDM_STATE_INFRASTRUCTURE_FORCE_DISCONNECTING = 8,
+	NDM_STATE_CEC_WORKING = 9,
+	NDM_STATE_CEC_FORCE_SUSPENDING = 10,
+	NDM_STATE_CEC_SUSPENDING = 11,
 } ndmState;
 
 // Daemons.
 typedef enum {
-	DAEMON_CEC = 0,
-	DAEMON_BOSS = 1,
-	DAEMON_NIM = 2,
-	DAEMON_FRIENDS = 3,
+	NDM_DAEMON_CEC = 0,
+	NDM_DAEMON_BOSS = 1,
+	NDM_DAEMON_NIM = 2,
+	NDM_DAEMON_FRIENDS = 3,
 } ndmDaemon;
 
 /// Used to specify multiple daemons.
 typedef enum {
-	DAEMON_MASK_CEC = BIT(DAEMON_CEC),
-	DAEMON_MASK_BOSS = BIT(DAEMON_BOSS),
-	DAEMON_MASK_NIM = BIT(DAEMON_NIM),
-	DAEMON_MASK_FRIENDS = BIT(DAEMON_FRIENDS),
-	DAEMON_MASK_BACKGROUOND = DAEMON_MASK_CEC | DAEMON_MASK_BOSS | DAEMON_MASK_NIM,
-	DAEMON_MASK_ALL = DAEMON_MASK_CEC | DAEMON_MASK_BOSS | DAEMON_MASK_NIM | DAEMON_MASK_FRIENDS,
-	DAEMON_MASK_DEFAULT = DAEMON_MASK_CEC | DAEMON_MASK_FRIENDS,
+	NDM_DAEMON_MASK_CEC = BIT(NDM_DAEMON_CEC),
+	NDM_DAEMON_MASK_BOSS = BIT(NDM_DAEMON_BOSS),
+	NDM_DAEMON_MASK_NIM = BIT(NDM_DAEMON_NIM),
+	NDM_DAEMON_MASK_FRIENDS = BIT(NDM_DAEMON_FRIENDS),
+	NDM_DAEMON_MASK_BACKGROUOND = NDM_DAEMON_MASK_CEC | NDM_DAEMON_MASK_BOSS | NDM_DAEMON_MASK_NIM,
+	NDM_DAEMON_MASK_ALL = NDM_DAEMON_MASK_CEC | NDM_DAEMON_MASK_BOSS | NDM_DAEMON_MASK_NIM | NDM_DAEMON_MASK_FRIENDS,
+	NDM_DAEMON_MASK_DEFAULT = NDM_DAEMON_MASK_CEC | NDM_DAEMON_MASK_FRIENDS,
 } ndmDaemonMask;
 
 // Daemon status.
 typedef enum {
-	DAEMON_STATUS_BUSY = 0,
-	DAEMON_STATUS_IDLE = 1,
-	DAEMON_STATUS_SUSPENDING = 2,
-	DAEMON_STATUS_SUSPENDED = 3,
+	NDM_DAEMON_STATUS_BUSY = 0,
+	NDM_DAEMON_STATUS_IDLE = 1,
+	NDM_DAEMON_STATUS_SUSPENDING = 2,
+	NDM_DAEMON_STATUS_SUSPENDED = 3,
 } ndmDaemonStatus;
 
 /// Initializes ndmu.
diff --git a/libctru/source/services/uds.c b/libctru/source/services/uds.c
index 7f292d9..38bc2d9 100644
--- a/libctru/source/services/uds.c
+++ b/libctru/source/services/uds.c
@@ -55,7 +55,7 @@ Result udsInit(size_t sharedmem_size, const char *username)
 	if(R_SUCCEEDED(ret))
 	{
 		ndm_state = 1;
-		ret = NDMU_EnterExclusiveState(EXCLUSIVE_STATE_LOCAL_COMMUNICATIONS);
+		ret = NDMU_EnterExclusiveState(NDM_EXCLUSIVE_STATE_LOCAL_COMMUNICATIONS);
 		if(R_SUCCEEDED(ret))
 		{
 			ndm_state = 2;