diff --git a/util/OSPixmap.h b/util/OSPixmap.h index 47cd53175..cf2c2b574 100644 --- a/util/OSPixmap.h +++ b/util/OSPixmap.h @@ -9,8 +9,6 @@ #ifndef SAMPLE_UTIL_PIXMAP_H_ #define SAMPLE_UTIL_PIXMAP_H_ -#include - #include #include diff --git a/util/linux/Linux_system_utils.cpp b/util/linux/Linux_system_utils.cpp index bd6c7afb7..5f47e55e4 100644 --- a/util/linux/Linux_system_utils.cpp +++ b/util/linux/Linux_system_utils.cpp @@ -8,6 +8,7 @@ #include "system_utils.h" +#include #include #include #include diff --git a/util/osx/OSXPixmap.h b/util/osx/OSXPixmap.h deleted file mode 100644 index f9cdfdcbf..000000000 --- a/util/osx/OSXPixmap.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// - -// OSXPixmap.h: Definition of the implementation of OSPixmap for OSX - -#ifndef UTIL_OSX_PIXMAP_H_ -#define UTIL_OSX_PIXMAP_H_ - -#include "OSPixmap.h" - -#endif // UTIL_OSX_PIXMAP_H_ diff --git a/util/osx/OSXPixmap.mm b/util/osx/OSXPixmap.mm deleted file mode 100644 index 16af8bf37..000000000 --- a/util/osx/OSXPixmap.mm +++ /dev/null @@ -1,15 +0,0 @@ -// -// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// - -// OSXPixmap.cpp: Implementation of OSPixmap for OSX - -#include "osx/OSXPixmap.h" - -// TODO(cwallez) find out the native OSX pixmap type and implement this -OSPixmap *CreateOSPixmap() -{ - return nullptr; -} diff --git a/util/posix/Posix_system_utils.cpp b/util/posix/Posix_system_utils.cpp index 71623f000..ae4f79d22 100644 --- a/util/posix/Posix_system_utils.cpp +++ b/util/posix/Posix_system_utils.cpp @@ -8,10 +8,8 @@ #include "system_utils.h" -#include #include #include -#include namespace angle { @@ -36,9 +34,4 @@ void Sleep(unsigned int milliseconds) } } -void SetLowPriorityProcess() -{ - setpriority(PRIO_PROCESS, getpid(), 10); -} - } // namespace angle diff --git a/util/util.gyp b/util/util.gyp index 7b8b1d1e9..b03adcf19 100644 --- a/util/util.gyp +++ b/util/util.gyp @@ -54,8 +54,6 @@ 'osx/OSX_system_utils.cpp', 'osx/OSXTimer.cpp', 'osx/OSXTimer.h', - 'osx/OSXPixmap.mm', - 'osx/OSXPixmap.h', 'osx/OSXWindow.mm', 'osx/OSXWindow.h', 'posix/Posix_system_utils.cpp', diff --git a/util/x11/X11Pixmap.h b/util/x11/X11Pixmap.h index fd12db624..d34382ad5 100644 --- a/util/x11/X11Pixmap.h +++ b/util/x11/X11Pixmap.h @@ -29,4 +29,4 @@ class X11Pixmap : public OSPixmap Display *mDisplay; }; -#endif // UTIL_X11_PIXMAP_H_ +#endif // UTIL_WIN32_PIXMAP_H_