From 2e1e78c23435a2d0a0a70319fec16af51c796bd4 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 3 Jan 2014 10:28:56 +0000
Subject: [PATCH] [HIDPARSER] * Do not include debug.h into the main header. *
 Do not define NDEBUG globally. CORE-7716

svn path=/trunk/; revision=61495
---
 reactos/lib/drivers/hidparser/CMakeLists.txt | 4 +---
 reactos/lib/drivers/hidparser/api.c          | 4 +++-
 reactos/lib/drivers/hidparser/context.c      | 4 +++-
 reactos/lib/drivers/hidparser/hidparser.c    | 3 +++
 reactos/lib/drivers/hidparser/hidparser.h    | 4 ----
 reactos/lib/drivers/hidparser/parser.c       | 4 +++-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/reactos/lib/drivers/hidparser/CMakeLists.txt b/reactos/lib/drivers/hidparser/CMakeLists.txt
index b0b15dd22f4..2ef75c7b32b 100644
--- a/reactos/lib/drivers/hidparser/CMakeLists.txt
+++ b/reactos/lib/drivers/hidparser/CMakeLists.txt
@@ -1,7 +1,5 @@
 
-add_definitions(
-    -DUNICODE -D_UNICODE
-    -DNDEBUG)
+add_definitions(-DUNICODE -D_UNICODE)
 
 list(APPEND SOURCE
     context.c
diff --git a/reactos/lib/drivers/hidparser/api.c b/reactos/lib/drivers/hidparser/api.c
index 2238ac817f5..8e48dc97951 100644
--- a/reactos/lib/drivers/hidparser/api.c
+++ b/reactos/lib/drivers/hidparser/api.c
@@ -8,9 +8,11 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-
 #include "parser.h"
 
+#define NDEBUG
+#include <debug.h>
+
 static ULONG KeyboardScanCodes[256] =
 { /*    0       1       2       3       4       5       6       7       8       9       A       B       C       D       E       F */
 /* 0 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x001e, 0x0030, 0x002e, 0x0020, 0x0012, 0x0021, 0x0022, 0x0023, 0x0017, 0x0024, 0x0025, 0x0026,
diff --git a/reactos/lib/drivers/hidparser/context.c b/reactos/lib/drivers/hidparser/context.c
index 984b9f3381c..3c66b3cd4dd 100644
--- a/reactos/lib/drivers/hidparser/context.c
+++ b/reactos/lib/drivers/hidparser/context.c
@@ -8,9 +8,11 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-
 #include "parser.h"
 
+#define NDEBUG
+#include <debug.h>
+
 typedef struct
 {
     ULONG Size;
diff --git a/reactos/lib/drivers/hidparser/hidparser.c b/reactos/lib/drivers/hidparser/hidparser.c
index dc91359d4af..25a04c19c9a 100644
--- a/reactos/lib/drivers/hidparser/hidparser.c
+++ b/reactos/lib/drivers/hidparser/hidparser.c
@@ -10,6 +10,9 @@
 
 #include "parser.h"
 
+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS
 TranslateHidParserStatus(
     IN HIDPARSER_STATUS Status)
diff --git a/reactos/lib/drivers/hidparser/hidparser.h b/reactos/lib/drivers/hidparser/hidparser.h
index f6eba3e03ec..4b647e9b10b 100644
--- a/reactos/lib/drivers/hidparser/hidparser.h
+++ b/reactos/lib/drivers/hidparser/hidparser.h
@@ -15,10 +15,6 @@
 #include <ntddk.h>
 #include <hidpddi.h>
 #include <hidpi.h>
-#ifndef NDEBUG
-#define NDEBUG
-#endif
-#include <debug.h>
 
 //
 // function prototypes
diff --git a/reactos/lib/drivers/hidparser/parser.c b/reactos/lib/drivers/hidparser/parser.c
index 0705788aa99..5912843442c 100644
--- a/reactos/lib/drivers/hidparser/parser.c
+++ b/reactos/lib/drivers/hidparser/parser.c
@@ -8,9 +8,11 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-
 #include "parser.h"
 
+#define NDEBUG
+#include <debug.h>
+
 static UCHAR ItemSize[4] = { 0, 1, 2, 4 };
 
 VOID