From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Wed, 27 Dec 2017 20:24:20 +0000 (+0000)
Subject: Merge "Fix build error in gcc 7.2"
X-Git-Tag: flounder_5.99.1~4
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=17339414fd26e831710b0b7f3a429b4dfb868d45;hp=-c;p=apps%2Fagl-service-windowmanager.git

Merge "Fix build error in gcc 7.2"
---

17339414fd26e831710b0b7f3a429b4dfb868d45
diff --combined src/app.cpp
index 337b0ac,bf84b22..d218f3e
--- a/src/app.cpp
+++ b/src/app.cpp
@@@ -29,7 -29,6 +29,6 @@@
  #include <json-c/json.h>
  
  #include <algorithm>
- #include <bits/signum.h>
  #include <csignal>
  #include <fstream>
  #include <json.hpp>
@@@ -629,7 -628,7 +628,7 @@@ void App::surface_created(uint32_t surf
  
     this->controller->layers[*layer_id]->add_surface(
        this->controller->surfaces[surface_id].get());
 -
 +   this->layout_commit();
     // activate the main_surface right away
     /*if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
        HMI_DEBUG("wm", "Activating main_surface (%d)", surface_id);
@@@ -736,7 -735,6 +735,7 @@@ char const *App::api_request_surface(ch
  
     this->controller->layers[*lid]->add_surface(
         this->controller->surfaces[sid].get());
 +   this->layout_commit();
  
     return nullptr;
  }
@@@ -753,7 -751,6 +752,7 @@@ void App::activate(int id) 
        // FOR CES DEMO >>>
        if ((0 == strcmp(label, "Radio"))
            || (0 == strcmp(label, "MediaPlayer"))
 +          || (0 == strcmp(label, "Music"))
            || (0 == strcmp(label, "Navigation"))) {
          for (auto i = surface_bg.begin(); i != surface_bg.end(); ++i) {
              if (id == *i) {
@@@ -793,7 -790,6 +792,7 @@@ void App::deactivate(int id) 
        // FOR CES DEMO >>>
        if ((0 == strcmp(label, "Radio"))
            || (0 == strcmp(label, "MediaPlayer"))
 +          || (0 == strcmp(label, "Music"))
            || (0 == strcmp(label, "Navigation"))) {
  
           // Store id