--- Daodan/src/Daodan.h	2013/03/19 15:00:23	705
+++ Daodan/src/Daodan.h	2015/03/23 23:29:19	1017
@@ -5,23 +5,11 @@
 #include <assert.h>
 #include "stdint.h"
 
-#define ONICALL __fastcall
-#define UUmType(t) typedef struct t t;
+#include "Oni/Oni.h"
 
-#define DDmAssert(expr) assert(expr);
-
-typedef unsigned char UUtBool;
-#define UUcTrue  ((UUtBool) 1)
-#define UUcFalse ((UUtBool) 0)
-
-typedef unsigned short UUtError;
-#define UUcError_None ((UUtError) 0)
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 
 extern HMODULE DDrDLLModule;
 extern HMODULE DDrONiModule;
 
-extern bool opt_border;
-extern bool opt_topmost;
-extern bool opt_gamma;
-
 #endif