commit 53fb7c1fe9c79839863e6de7179354994a223946
parent fe7b54eb8d7b2bca9f15a4754d4777ae22185ebb
Author: Kyle Milz <kyle@getaddrinfo.net>
Date: Mon, 21 Mar 2016 19:44:19 -0600
viewer: remove some unneeded stuff from common.h
Diffstat:
3 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/viewer/af_unix.h b/viewer/af_unix.h
@@ -2,7 +2,6 @@
#define AF_UNIX_H
#include <cstddef>
-#include <cstdint>
#include <vector>
class af_unix {
diff --git a/viewer/demo-atlas.cxx b/viewer/demo-atlas.cxx
@@ -22,6 +22,13 @@
#include "demo-atlas.h"
+#define gl(name) \
+ for (GLint __ee, __ii = 0; \
+ __ii < 1; \
+ (__ii++, \
+ (__ee = glGetError()) && \
+ (fprintf (stderr, "gl" #name " failed with error %04X on line %d\n", __ee, __LINE__), abort (), 0))) \
+ gl##name
struct demo_atlas_t {
unsigned int refcount;
diff --git a/viewer/demo-common.h b/viewer/demo-common.h
@@ -41,12 +41,8 @@
#endif
-#define STRINGIZE1(Src) #Src
-#define STRINGIZE(Src) STRINGIZE1(Src)
-
#define ARRAY_LEN(Array) (sizeof (Array) / sizeof (*Array))
-
#define MIN_FONT_SIZE 10
#define TOLERANCE (1./2048)
@@ -54,20 +50,11 @@
#define LOGW(...) ((void) fprintf (stderr, __VA_ARGS__))
#define LOGE(...) ((void) fprintf (stderr, __VA_ARGS__), abort ())
-#define gl(name) \
- for (GLint __ee, __ii = 0; \
- __ii < 1; \
- (__ii++, \
- (__ee = glGetError()) && \
- (fprintf (stderr, "gl" #name " failed with error %04X on line %d\n", __ee, __LINE__), abort (), 0))) \
- gl##name
-
-
static inline void
die (const char *msg)
{
- fprintf (stderr, "%s\n", msg);
- exit (1);
+ fprintf (stderr, "%s\n", msg);
+ exit (1);
}
template <typename T>
@@ -76,8 +63,6 @@ T clamp (T v, T m, T M)
return v < m ? m : v > M ? M : v;
}
-#define DEMO_FUNC __func__
-
struct auto_trace_t
{
auto_trace_t (const char *func_) : func (func_)
@@ -90,6 +75,6 @@ struct auto_trace_t
const char * const func;
};
-#define TRACE() auto_trace_t trace(DEMO_FUNC)
+#define TRACE() auto_trace_t trace(__func__)
#endif /* DEMO_COMMON_H */