Cleanup pointless abort variations.

diff --git a/dispatch.py b/dispatch.py
index 292b69f189cd317c5b4a840909af97418cb0f02e..052a5596fe2f9ac6789330b05df05b5caaf4daad 100644 (file)
--- 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 64ea360eb34ba5e27c76ff08faa26923b99448f9..9f9345aabec671915c555f56612c1305778075b5 100644 (file)
--- 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 164c9777b073f68f2db7c37d993fe824d2646d10..c83d7139246e52a3d416ae253ae4223d1c2c8b3e 100644 (file)
--- 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 a97cef25103e2882af4b0bdc6cfb87e51759ca87..ad6df898f5a0f1d289221cb89fa9a782a1760255 100644 (file)
--- 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 d41acdef1d26e994ac635d0f0009fb3ca1db625e..f76cd3f966aa47f56bbae9683a5c3b0a1687b5bf 100644 (file)
--- 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_ */