summaryrefslogtreecommitdiffstats
path: root/minui/resources.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'minui/resources.cpp')
-rw-r--r--minui/resources.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/minui/resources.cpp b/minui/resources.cpp
index 9ccbf4b1b..c0f9c5c85 100644
--- a/minui/resources.cpp
+++ b/minui/resources.cpp
@@ -14,24 +14,22 @@
* limitations under the License.
*/
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
#include <fcntl.h>
+#include <linux/fb.h>
+#include <linux/kd.h>
#include <stdio.h>
-
+#include <stdlib.h>
+#include <string.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/types.h>
-
-#include <linux/fb.h>
-#include <linux/kd.h>
+#include <unistd.h>
#include <vector>
+
#include <png.h>
-#include "minui.h"
+#include "minui/minui.h"
#define SURFACE_DATA_ALIGNMENT 8
@@ -374,7 +372,9 @@ int res_create_alpha_surface(const char* name, GRSurface** pSurface) {
// This function tests if a locale string stored in PNG (prefix) matches
// the locale string provided by the system (locale).
bool matches_locale(const char* prefix, const char* locale) {
- if (locale == NULL) return false;
+ if (locale == nullptr) {
+ return false;
+ }
// Return true if the whole string of prefix matches the top part of
// locale. For instance, prefix == "en" matches locale == "en_US";