Merge branch 'fix-warning'
This commit is contained in:
commit
ed6f5d214c
|
@ -72,7 +72,7 @@ Con *con_inside_floating(Con *con);
|
||||||
* Checks if the given container is inside a focused container.
|
* Checks if the given container is inside a focused container.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
Con *con_inside_focused(Con *con);
|
bool con_inside_focused(Con *con);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the container with the given client window ID or NULL if no such
|
* Returns the container with the given client window ID or NULL if no such
|
||||||
|
|
|
@ -362,7 +362,7 @@ Con *con_inside_floating(Con *con) {
|
||||||
* Checks if the given container is inside a focused container.
|
* Checks if the given container is inside a focused container.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
Con *con_inside_focused(Con *con) {
|
bool con_inside_focused(Con *con) {
|
||||||
if (con == focused)
|
if (con == focused)
|
||||||
return true;
|
return true;
|
||||||
if (!con->parent)
|
if (!con->parent)
|
||||||
|
|
Loading…
Reference in New Issue