mirror of
https://github.com/gnif/LookingGlass.git
synced 2024-12-22 22:01:46 +00:00
[all] move min/max and upcast macros into common/util.h
This commit is contained in:
parent
ebf20dd108
commit
0d27092ef5
5 changed files with 36 additions and 12 deletions
|
@ -24,12 +24,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include "common/types.h"
|
#include "common/types.h"
|
||||||
|
#include "common/util.h"
|
||||||
#define min(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; })
|
|
||||||
#define max(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a > _b ? _a : _b; })
|
|
||||||
|
|
||||||
#define UPCAST(type, x) \
|
|
||||||
(type *)((uintptr_t)(x) - offsetof(type, base))
|
|
||||||
|
|
||||||
// reads the specified file into a new buffer
|
// reads the specified file into a new buffer
|
||||||
// the callee must free the buffer
|
// the callee must free the buffer
|
||||||
|
|
32
common/include/common/util.h
Normal file
32
common/include/common/util.h
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
/**
|
||||||
|
* Looking Glass
|
||||||
|
* Copyright © 2017-2021 The Looking Glass Authors
|
||||||
|
* https://looking-glass.io
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU General Public License as published by the Free
|
||||||
|
* Software Foundation; either version 2 of the License, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||||
|
* more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc., 59
|
||||||
|
* Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _H_LG_COMMON_UTIL_
|
||||||
|
#define _H_LG_COMMON_UTIL_
|
||||||
|
|
||||||
|
#define min(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); \
|
||||||
|
_a < _b ? _a : _b; })
|
||||||
|
#define max(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); \
|
||||||
|
_a > _b ? _a : _b; })
|
||||||
|
|
||||||
|
#define UPCAST(type, x) \
|
||||||
|
(type *)((uintptr_t)(x) - offsetof(type, base))
|
||||||
|
|
||||||
|
#endif
|
|
@ -19,12 +19,10 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common/rects.h"
|
#include "common/rects.h"
|
||||||
|
#include "common/util.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#define min(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; })
|
|
||||||
#define max(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a > _b ? _a : _b; })
|
|
||||||
|
|
||||||
struct Corner
|
struct Corner
|
||||||
{
|
{
|
||||||
int x;
|
int x;
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#include "common/time.h"
|
#include "common/time.h"
|
||||||
#include "common/stringutils.h"
|
#include "common/stringutils.h"
|
||||||
#include "common/cpuinfo.h"
|
#include "common/cpuinfo.h"
|
||||||
|
#include "common/util.h"
|
||||||
|
|
||||||
#include <lgmp/host.h>
|
#include <lgmp/host.h>
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include "common/locking.h"
|
#include "common/locking.h"
|
||||||
#include "common/stringutils.h"
|
#include "common/stringutils.h"
|
||||||
#include "common/ivshmem.h"
|
#include "common/ivshmem.h"
|
||||||
|
#include "common/util.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
@ -37,9 +38,6 @@
|
||||||
|
|
||||||
#include <lgmp/client.h>
|
#include <lgmp/client.h>
|
||||||
|
|
||||||
#define min(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; })
|
|
||||||
#define max(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a > _b ? _a : _b; })
|
|
||||||
|
|
||||||
struct state
|
struct state
|
||||||
{
|
{
|
||||||
bool running;
|
bool running;
|
||||||
|
|
Loading…
Reference in a new issue