From 1598cd42f578d724a63787eda25d224398b40fc9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jose.r.fonseca@gmail.com>
Date: Sat, 28 May 2011 00:27:47 +0100
Subject: [PATCH] Cleanup pointless abort variations.

---
 dispatch.py      | 3 +--
 glproc.py        | 2 --
 trace.py         | 1 -
 trace_writer.cpp | 5 -----
 trace_writer.hpp | 2 --
 5 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index 292b69f..052a559 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -49,7 +49,6 @@ class Dispatcher:
         #
         #  static __PROC __getPublicProcAddress(const char *name);
         #  static __PROC __getPrivateProcAddress(const char *name);
-        #  static void __abort(void);
         #
         raise NotImplementedError
 
@@ -118,6 +117,6 @@ class Dispatcher:
                 assert function.fail != ''
                 print '            return %s;' % function.fail
         else:
-            print '            __abort();'
+            print '            OS::Abort();'
 
 
diff --git a/glproc.py b/glproc.py
index 64ea360..9f9345a 100644
--- a/glproc.py
+++ b/glproc.py
@@ -419,7 +419,6 @@ class GlDispatcher(Dispatcher):
         print '#  else'
         print '#    define __getPrivateProcAddress(name) glXGetProcAddressARB((const GLubyte *)(name))'
         print '#  endif'
-        print '#  define __abort() OS::Abort()'
         print '#else /* !RETRACE */'
         print '#  ifdef _WIN32'
         print '#    define __getPrivateProcAddress(name) __wglGetProcAddress(name)'
@@ -434,7 +433,6 @@ class GlDispatcher(Dispatcher):
         print '       static inline __GLXextFuncPtr __glXGetProcAddressARB(const GLubyte * procName);'
         print '#    endif'
         print '#  endif'
-        print '#  define __abort() Trace::Abort()'
         print '#endif /* !RETRACE */'
         print
         
diff --git a/trace.py b/trace.py
index 164c977..c83d713 100644
--- a/trace.py
+++ b/trace.py
@@ -485,7 +485,6 @@ __getPublicProcAddress(LPCSTR lpProcName)
     return GetProcAddress(g_hDll, lpProcName);
 }
 
-#define __abort() OS::Abort()
 ''' % self.dllname
 
         dispatcher = Dispatcher()
diff --git a/trace_writer.cpp b/trace_writer.cpp
index a97cef2..ad6df89 100644
--- a/trace_writer.cpp
+++ b/trace_writer.cpp
@@ -344,11 +344,6 @@ void LiteralOpaque(const void *addr) {
     WriteUInt((size_t)addr);
 }
 
-void Abort(void) {
-    Close();
-    OS::Abort();
-}
-
 } /* namespace Trace */
 
 
diff --git a/trace_writer.hpp b/trace_writer.hpp
index d41acde..f76cd3f 100644
--- a/trace_writer.hpp
+++ b/trace_writer.hpp
@@ -104,8 +104,6 @@ namespace Trace {
     void LiteralBitmask(const BitmaskSig &bitmask, unsigned long long value);
     void LiteralNull(void);
     void LiteralOpaque(const void *ptr);
-
-    void Abort(void);
 }
 
 #endif /* _TRACE_WRITER_HPP_ */
-- 
2.45.2