[mutter] cogl: Remove some now dead code
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl: Remove some now dead code
- Date: Wed, 20 Jul 2016 06:25:47 +0000 (UTC)
commit d63e9452d98c15d6fcf80460a51eace8676d5339
Author: Jonas Ådahl <jadahl gmail com>
Date: Fri May 6 14:50:23 2016 +0800
cogl: Remove some now dead code
We require glib and don't support building on win32 any more.
https://bugzilla.gnome.org/show_bug.cgi?id=768976
cogl/cogl/cogl-debug.h | 5 +----
cogl/cogl/cogl-util.h | 47 -----------------------------------------------
2 files changed, 1 insertions(+), 51 deletions(-)
---
diff --git a/cogl/cogl/cogl-debug.h b/cogl/cogl/cogl-debug.h
index 91a49e1..ae116a2 100644
--- a/cogl/cogl/cogl-debug.h
+++ b/cogl/cogl/cogl-debug.h
@@ -82,10 +82,7 @@ typedef enum {
extern GHashTable *_cogl_debug_instances;
#define COGL_DEBUG_N_LONGS COGL_FLAGS_N_LONGS_FOR_SIZE (COGL_DEBUG_N_FLAGS)
-/* _cogl_debug_flags currently needs to exported outside of the shared
- library for cogl-pango. The special COGL_EXPORT macro is needed to
- get this to work when building with MSVC */
-COGL_EXPORT extern unsigned long _cogl_debug_flags[COGL_DEBUG_N_LONGS];
+extern unsigned long _cogl_debug_flags[COGL_DEBUG_N_LONGS];
#define COGL_DEBUG_ENABLED(flag) \
COGL_FLAGS_GET (_cogl_debug_flags, flag)
diff --git a/cogl/cogl/cogl-util.h b/cogl/cogl/cogl-util.h
index 42651c7..60be7db 100644
--- a/cogl/cogl/cogl-util.h
+++ b/cogl/cogl/cogl-util.h
@@ -46,19 +46,6 @@
#error "cogl-config.h must be included before including cogl-util.h"
#endif
-/* When compiling with Visual Studio, symbols that represent data that
- are exported out of the DLL need to be marked with the dllexport
- attribute. */
-#ifdef _MSC_VER
-#ifdef COGL_BUILD_EXP
-#define COGL_EXPORT __declspec(dllexport)
-#else
-#define COGL_EXPORT __declspec(dllimport)
-#endif
-#else
-#define COGL_EXPORT
-#endif
-
int
_cogl_util_next_p2 (int a);
@@ -197,42 +184,8 @@ _cogl_util_popcountl (unsigned long num)
#endif /* COGL_UTIL_HAVE_BUILTIN_POPCOUNTL */
-#ifdef COGL_HAS_GLIB_SUPPORT
#define _COGL_RETURN_IF_FAIL(EXPR) g_return_if_fail(EXPR)
#define _COGL_RETURN_VAL_IF_FAIL(EXPR, VAL) g_return_val_if_fail(EXPR, VAL)
-#else
-#ifdef COGL_ENABLE_DEBUG
-#define _COGL_RETURN_START do {
-#define _COGL_RETURN_END } while (0)
-#else /* COGL_ENABLE_DEBUG */
-/* If debugging is disabled then we don't actually want to do the
- * check but we still want the code for the expression to be generated
- * so that it won't give loads of warnings about unused variables.
- * Therefore we just surround the block with if(0) */
-#define _COGL_RETURN_START do { if (0) {
-#define _COGL_RETURN_END } } while (0)
-#endif /* COGL_ENABLE_DEBUG */
-#define _COGL_RETURN_IF_FAIL(EXPR) _COGL_RETURN_START { \
- if (!(EXPR)) \
- { \
- fprintf (stderr, "file %s: line %d: assertion `%s' failed", \
- __FILE__, \
- __LINE__, \
- #EXPR); \
- return; \
- }; \
- } _COGL_RETURN_END
-#define _COGL_RETURN_VAL_IF_FAIL(EXPR, VAL) _COGL_RETURN_START { \
- if (!(EXPR)) \
- { \
- fprintf (stderr, "file %s: line %d: assertion `%s' failed", \
- __FILE__, \
- __LINE__, \
- #EXPR); \
- return (VAL); \
- }; \
- } _COGL_RETURN_END
-#endif /* COGL_HAS_GLIB_SUPPORT */
/* Match a CoglPixelFormat according to channel masks, color depth,
* bits per pixel and byte order. These information are provided by
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]