summaryrefslogtreecommitdiff
path: root/src/win95
diff options
context:
space:
mode:
authorSteven Fuller <relnev@icculus.org>2001-07-27 21:41:02 +0000
committerPatryk Obara <dreamer.tan@gmail.com>2019-08-20 02:22:36 +0200
commit8b4a564235635f7a666aedc0fc79913865ad56b5 (patch)
treef8cd76c7cc8333cbf471cf4139264eac1696f39f /src/win95
parent936a5198e46e3c7a8f72959373a69336b1697e76 (diff)
Few more files compile.
Diffstat (limited to 'src/win95')
-rw-r--r--src/win95/db.h4
-rw-r--r--src/win95/inline.h9
-rw-r--r--src/win95/platform.h24
3 files changed, 32 insertions, 5 deletions
diff --git a/src/win95/db.h b/src/win95/db.h
index 10e5d4d..cc0ee47 100644
--- a/src/win95/db.h
+++ b/src/win95/db.h
@@ -70,7 +70,7 @@
/* I N C L U D E D S ************************************************** */
#include "advwin32.h"
#ifndef DB_NOWINDOWS
- #include <windows.h>
+// #include <windows.h>
#include "advwin32.h"
#endif
@@ -292,6 +292,8 @@ struct db_dd_mode_tag
/* Don't prototype anything or declare globals if NDEBUG is defined. */
#ifndef NDEBUG
+#define __cdecl
+
/* New formatted debugging fns. */
extern void __cdecl db_logf_fired(const char *fmtStrP, ...);
extern void __cdecl db_printf_fired(int x, int y, const char *fmtStrP, ...);
diff --git a/src/win95/inline.h b/src/win95/inline.h
index 719daf3..f09e79a 100644
--- a/src/win95/inline.h
+++ b/src/win95/inline.h
@@ -1,6 +1,15 @@
#ifndef INLINE_INCLUDED
#define INLINE_INCLUDED
+#ifndef min
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+
+#ifndef max
+#define max(a, b) (((a) > (b)) ? (a) : (b))
+#endif
+
+
#if SUPPORT_MMX
#include "mmx_math.h"
#endif
diff --git a/src/win95/platform.h b/src/win95/platform.h
index cefebf1..7547802 100644
--- a/src/win95/platform.h
+++ b/src/win95/platform.h
@@ -25,12 +25,15 @@ extern "C" {
#define Hardware2dTextureClipping No
+#ifndef min
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+#endif
-/*
-
- Types
+#ifndef max
+#define max(a, b) (((a) > (b)) ? (a) : (b))
+#endif
-*/
+/* Types */
typedef int BOOL;
@@ -56,6 +59,19 @@ typedef struct LONGLONGCH {
} LONGLONGCH;
+typedef int FILETIME;
+
+typedef struct SYSTEMTIME
+{
+//#warning "SYSTEMTIME format is not correct"
+ int wHour;
+ int wMinute;
+ int wSecond;
+ int wYear;
+ int wMonth;
+ int wDay;
+} SYSTEMTIME;
+
/*
Sine and Cosine