Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -10,7 +10,6 @@
 *
 */

-#if AZ_TRAIT_OS_PLATFORM_APPLE
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <AzFramework/Process/ProcessCommunicator.h>
@@ -242,4 +241,3 @@ namespace AzFramework
    }
 } // namespace AzFramework

-#endif // AZ_TRAIT_OS_PLATFORM_APPLE
@@ -11,7 +11,6 @@
 */


-#if AZ_TRAIT_OS_PLATFORM_APPLE

 #include <AzFramework/Process/ProcessWatcher.h>
 #include <AzFramework/Process/ProcessCommunicator.h>
@@ -433,4 +432,3 @@ namespace AzFramework
    }
 } //namespace AzFramework

-#endif // AZ_TRAIT_OS_PLATFORM_APPLE