summaryrefslogtreecommitdiff
path: root/src/win95/dxlog.h
diff options
context:
space:
mode:
authorSteven Fuller <relnev@icculus.org>2001-07-28 01:21:46 +0000
committerPatryk Obara <dreamer.tan@gmail.com>2019-08-20 02:22:36 +0200
commit6d5a3cec554f6afc5f075722fba7e2aa464f5676 (patch)
treed0a23200c53af8cd58cc649457a26ddf748c7f46 /src/win95/dxlog.h
parentfd8ed25d23c8187a2e6f9d7e81fdbd8f98b22f1a (diff)
More compiling...
Diffstat (limited to 'src/win95/dxlog.h')
-rw-r--r--src/win95/dxlog.h18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/win95/dxlog.h b/src/win95/dxlog.h
index d67b57c..8636720 100644
--- a/src/win95/dxlog.h
+++ b/src/win95/dxlog.h
@@ -2,9 +2,6 @@
#define _included_dxlog_h_
#include "system.h"
-#include "ddraw.h"
-#include "d3d.h"
-#include "d3drm.h"
#ifdef __cplusplus
extern "C" {
@@ -12,7 +9,7 @@ extern "C" {
#if debug
-void dx_err_log(HRESULT error, int line, char const * file);
+void dx_err_log(int error, int line, char const * file);
void dx_str_log(char const * str, int line, char const * file);
void dx_line_log(int line, char const * file);
void dx_strf_log(char const * fmt, ...);
@@ -23,10 +20,21 @@ void dx_strf_log(char const * fmt, ...);
#else
+/* TODO: make these static inline to hush the compiler */
+void dx_err_log(int error, int line, char const * file);
+void dx_str_log(char const * str, int line, char const * file);
+void dx_line_log(int line, char const * file);
+void dx_strf_log(char const * fmt, ...);
+
+#define LOGDXERR(error) dx_err_log(error,__LINE__,__FILE__)
+#define LOGDXSTR(str) dx_str_log(str,__LINE__,__FILE__)
+#define LOGDXFMT(args) (dx_line_log(__LINE__,__FILE__),dx_strf_log args)
+
+/*
#define LOGDXERR(error) (void)0
#define LOGDXSTR(str) (void)0
#define LOGDXFMT(args) (void)0
-
+*/
#endif