| commit | 8b021633ad930b49fdaf9de0416b633a401e8c03 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Mar 15 22:43:49 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Mar 15 22:43:49 2024 +0000 |
| tree | adc1c6d6ec3c8fb60d7659888f6dbd3849c3ea7c | |
| parent | bc54bf1045673ca964e2bb33a329315d0a07ee52 [diff] | |
| parent | e52954e47633eacc6241a06b2aba2c98bae0eacf [diff] |
Merge "Remove voodoo." into main
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h b/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h index 13b70e5..c8b2962 100644 --- a/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h +++ b/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h
@@ -16,7 +16,6 @@ #pragma once -#define __STDC_LIMIT_MACROS #include <inttypes.h> #include <sys/types.h>
diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp index 9ce379c..717640f 100644 --- a/services/audiopolicy/service/AudioPolicyService.cpp +++ b/services/audiopolicy/service/AudioPolicyService.cpp
@@ -18,9 +18,6 @@ //#define LOG_NDEBUG 0 #include "Configuration.h" -#undef __STRICT_ANSI__ -#define __STDINT_LIMITS -#define __STDC_LIMIT_MACROS #include <stdint.h> #include <sys/time.h> #include <dlfcn.h>