More compiling...

This commit is contained in:
Steven Fuller 2001-07-28 01:21:46 +00:00 committed by Patryk Obara
parent fd8ed25d23
commit 6d5a3cec55
40 changed files with 98 additions and 74 deletions

View file

@ -68,11 +68,7 @@
#define DB_H_INCLUDED
/* I N C L U D E D S ************************************************** */
#include "advwin32.h"
#ifndef DB_NOWINDOWS
// #include <windows.h>
#include "advwin32.h"
#endif
//#include "advwin32.h"
/* Permit use in a C++ source file. */
#ifdef __cplusplus

View file

@ -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

View file

@ -18,7 +18,7 @@
#ifndef list_template_hpp
#define list_template_hpp
#pragma once
//#pragma once
#include <stdio.h>

View file

@ -1,6 +1,9 @@
#ifndef PLATFORM_INCLUDED
#define PLATFORM_INCLUDED
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h> // int64_t
#include "shape.h" // struct imageheader
@ -33,12 +36,20 @@ extern "C" {
#define max(a, b) (((a) > (b)) ? (a) : (b))
#endif
#define stricmp strcasecmp
#define TRUE 1
#define FALSE 0
#define stricmp strcasecmp
#define _stricmp strcasecmp
/* Types */
/* windows junk */
typedef int GUID;
typedef int DPID;
typedef int HINSTANCE;
typedef int WPARAM;
typedef int LPARAM;
typedef int BOOL;

View file

@ -30,6 +30,7 @@ extern struct DEBUGGINGTEXTOPTIONS ShowDebuggingText;
#define DEBUGGING_TEXT_ON 0
#endif
#if 0 /* stupid defines */
#if DEBUGGING_TEXT_ON
extern int PrintDebuggingText(const char* t, ...);
#else
@ -41,3 +42,7 @@ extern int ReleasePrintDebuggingText(const char* t, ...);
#else
#define PrintDebuggingText(ignore)
#endif
#endif /* ... */
extern int PrintDebuggingText(const char* t, ...);
extern int ReleasePrintDebuggingText(const char* t, ...);