[ACPICA]

- Define ACPI_USE_SYSTEM_CLIBRARY to use our libc functions rather than acpica's own implementations. Fixes MSVC release build and obsoletes some ROS-diffs
CORE-11184 #resolve

svn path=/trunk/; revision=71482

diff --git a/reactos/drivers/bus/acpi/CMakeLists.txt b/reactos/drivers/bus/acpi/CMakeLists.txt
index 36628b7..1f07bdb 100644 (file)
--- a/reactos/drivers/bus/acpi/CMakeLists.txt
+++ b/reactos/drivers/bus/acpi/CMakeLists.txt
@@ -172,7 +172,7 @@ add_library(acpica
     acpica/utilities/utglobal.c)
 
 add_pch(acpica acpica/include/acpi.h ACPICA_SOURCE)
-set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE")
+set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE;ACPI_USE_SYSTEM_CLIBRARY")
 add_dependencies(acpica bugcodes xdk)
 
 list(APPEND ACPI_SOURCE
@@ -193,7 +193,7 @@ list(APPEND ACPI_SOURCE
 
 add_library(acpi SHARED ${ACPI_SOURCE})
 set_module_type(acpi kernelmodedriver)
-target_link_libraries(acpi wdmguid acpica ${PSEH_LIB})
+target_link_libraries(acpi wdmguid acpica memcmp strtol ${PSEH_LIB})
 add_importlibs(acpi ntoskrnl hal)
 add_pch(acpi precomp.h ACPI_SOURCE)
 add_cd_file(TARGET acpi DESTINATION reactos/system32/drivers NO_CAB FOR all)

diff --git a/reactos/drivers/bus/acpi/acpica/include/acclib.h b/reactos/drivers/bus/acpi/acpica/include/acclib.h
index 7077733..56a3072 100644 (file)
--- a/reactos/drivers/bus/acpi/acpica/include/acclib.h
+++ b/reactos/drivers/bus/acpi/acpica/include/acclib.h
@@ -118,17 +118,10 @@ strncpy (
     const char              *SrcString,
     ACPI_SIZE               Count);
 
-#ifdef __REACTOS__
-char *
-strstr (
-    const char              *String1,
-    const char              *String2);
-#else /* __REACTOS__ */
 char *
 strstr (
     char                    *String1,
     char                    *String2);
-#endif /* __REACTOS__ */
 
 
 /* Conversion */
@@ -142,19 +135,11 @@ strtoul (
 
 /* Memory */
 
-#ifdef __REACTOS__
-int
-memcmp (
-    const void              *Buffer1,
-    const void              *Buffer2,
-    ACPI_SIZE               Count);
-#else /* __REACTOS__ */
 int
 memcmp (
     void                    *Buffer1,
     void                    *Buffer2,
     ACPI_SIZE               Count);
-#endif /* __REACTOS__ */
 
 void *
 memcpy (

diff --git a/reactos/drivers/bus/acpi/acpica/utilities/utclib.c b/reactos/drivers/bus/acpi/acpica/utilities/utclib.c
index 92328b1..efa300d 100644 (file)
--- a/reactos/drivers/bus/acpi/acpica/utilities/utclib.c
+++ b/reactos/drivers/bus/acpi/acpica/utilities/utclib.c
@@ -107,19 +107,11 @@
  * DESCRIPTION: Compare two Buffers, with a maximum length
  *
  ******************************************************************************/
-#ifdef __REACTOS__
-int
-memcmp (
-    const void              *VBuffer1,
-    const void              *VBuffer2,
-    ACPI_SIZE               Count)
-#else /* __REACTOS__ */
 int
 memcmp (
     void                    *VBuffer1,
     void                    *VBuffer2,
     ACPI_SIZE               Count)
-#endif /* __REACTOS__ */
 {
     char                    *Buffer1 = (char *) VBuffer1;
     char                    *Buffer2 = (char *) VBuffer2;
@@ -514,17 +506,10 @@ strncat (
  *
  ******************************************************************************/
 
-#ifdef __REACTOS__
-char *
-strstr (
-    const char              *String1,
-    const char              *String2)
-#else /* __REACTOS **/
 char *
 strstr (
     char                    *String1,
     char                    *String2)
-#endif /* __REACTOS__ */
 {
     UINT32                  Length;
 
@@ -532,22 +517,14 @@ strstr (
     Length = strlen (String2);
     if (!Length)
     {
-#ifdef __REACTOS__
-        return (char *)(String1);
-#else /* __REACTOS__ */
         return (String1);
-#endif /* __REACTOS__ */
     }
 
     while (strlen (String1) >= Length)
     {
         if (memcmp (String1, String2, Length) == 0)
         {
-#ifdef __REACTOS__
-            return (char *)(String1);
-#else /* __REACTOS__ */
             return (String1);
-#endif /* __REACTOS__ */
         }
         String1++;
     }