aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-05-28 07:01:18 +0000
committerdos-reis <gdr@axiomatics.org>2008-05-28 07:01:18 +0000
commit45b01c6033a49183b9d7b22f7fc58484897edd48 (patch)
tree7dcea3a721d9434bcbd4300e275a3bd813bada98
parent6ec189437ed7e4f737875407152cd2c359d2942e (diff)
downloadopen-axiom-45b01c6033a49183b9d7b22f7fc58484897edd48.tar.gz
* include/open-axiom.h (openaxiom_handle): New datatype.
* hyper/node.h [!X_DISPLAY_MISSING]: Use it.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/hyper/node.h14
-rw-r--r--src/include/open-axiom.h9
3 files changed, 21 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3bcdbb1f..582eca79 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-27 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * include/open-axiom.h (openaxiom_handle): New datatype.
+ * hyper/node.h [!X_DISPLAY_MISSING]: Use it.
+
2008-05-25 Gabriel Dos Reis <gdr@cs.tamu.edu>
* algebra/catdef.spad.pamphlet (OrderedSemiGroup): New.
diff --git a/src/hyper/node.h b/src/hyper/node.h
index 730ea30f..43f4dc6b 100644
--- a/src/hyper/node.h
+++ b/src/hyper/node.h
@@ -36,7 +36,7 @@
#ifndef OPENAXIOM_NODE
#define OPENAXIOM_NODE
-#include "openaxiom-c-macros.h"
+#include "open-axiom.h"
#include "hash.h"
#ifndef X_DISPLAY_MISSING
@@ -50,12 +50,12 @@ typedef GC openaxiom_graphic_context;
typedef XFontStruct openaxiom_font;
typedef Cursor openaxiom_cursor;
#else /* X_DISPLAY_MISSING */
-typedef HANDLE openaxiom_window;
-typedef HANDLE openaxiom_pixmap;
-typedef HANDLE openaxiom_image;
-typedef HANDLE openaxiom_graphic_context;
-typedef HANDLE openaxiom_cursor;
-typedef HANDLE openaxiom_font;
+typedef openaxiom_handle openaxiom_window;
+typedef openaxiom_handle openaxiom_pixmap;
+typedef openaxiom_handle openaxiom_image;
+typedef openaxiom_handle openaxiom_graphic_context;
+typedef openaxiom_handle openaxiom_cursor;
+typedef openaxiom_handle openaxiom_font;
#endif /* X_DISPLAY_MISSING */
/* Struct forward declarations */
diff --git a/src/include/open-axiom.h b/src/include/open-axiom.h
index e2c545a7..1ae28921 100644
--- a/src/include/open-axiom.h
+++ b/src/include/open-axiom.h
@@ -34,6 +34,8 @@
#ifndef OPENAXIOM_included
#define OPENAXIOM_included
+#include "openaxiom-c-macros.h"
+
/* Cope with MS-platform oddities. */
#ifdef __MINGW32__
# ifdef DLL_EXPORT
@@ -53,4 +55,11 @@
#endif
typedef uint8_t openaxiom_byte;
+/* The opaque datatype. */
+#ifdef __MINGW32__
+typedef HANDLE openaxiom_handle;
+#else
+typedef void* openaxiom_handle;
+#endif
+
#endif /* OPENAXIOM_included */