Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-08-15 18:27:29 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup types and include's to ease GCC compilation. (PR #881)

Browse Source 
. Do not include alarm.h as it is not needed.
The code in alarm.h is not complete: all the extern functions are missing and different linkers might complain about this.

. Do not redefine some windows.h types in VICE/types.h as it becomes harder to keep them consistent.
Biggest problem is DWORD_IS_LONG as the best way to define it in linux 64 bit is as an int. Prefer to use StdAfx.h.
This commit is contained in:
Andrea
2020-11-29 17:22:50 +00:00
committed by GitHub
parent 5d90b64829
commit 93346c215f
6 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/CommonVICE/types.h
View File

@@ -30,34 +30,8 @@
#ifndef _TYPES_H #ifndef _TYPES_H
#define _TYPES_H #define _TYPES_H
#ifndef BYTE // do not redefine windows.h types here to avoid inconsistencies
#define BYTE unsigned char // include StdAfx.h before this file
#endif
#ifndef WORD
#define WORD unsigned short
#endif
#ifndef DWORD
//#ifdef DWORD_IS_LONG
#define DWORD unsigned long
//#else
//#define DWORD unsigned int
//#endif
#endif
/* RGJ added for AppleWin */
#ifndef ULONG
typedef unsigned long ULONG;
#endif
/* TC added for AppleWin */
#ifndef LPVOID
typedef void *LPVOID;
#endif
typedef signed char SIGNED_CHAR;
typedef signed short SWORD;
typedef signed int SDWORD;
typedef DWORD CLOCK; typedef DWORD CLOCK;
/* Maximum value of a CLOCK. */ /* Maximum value of a CLOCK. */

8
source/Configuration/PageConfigTfe.h
View File

@@ -21,10 +21,10 @@ protected:
virtual void DlgCANCEL(HWND window); virtual void DlgCANCEL(HWND window);
private: private:
BOOL CPageConfigTfe::get_tfename(int number, char **ppname, char **ppdescription); BOOL get_tfename(int number, char **ppname, char **ppdescription);
int CPageConfigTfe::gray_ungray_items(HWND hwnd); int gray_ungray_items(HWND hwnd);
void CPageConfigTfe::init_tfe_dialog(HWND hwnd); void init_tfe_dialog(HWND hwnd);
void CPageConfigTfe::save_tfe_dialog(HWND hwnd); void save_tfe_dialog(HWND hwnd);
static CPageConfigTfe* ms_this; static CPageConfigTfe* ms_this;
static uilib_localize_dialog_param ms_dialog[]; static uilib_localize_dialog_param ms_dialog[];

3
source/Tfe/Uilib.h
View File

@@ -29,9 +29,6 @@
#ifndef _UILIB_H #ifndef _UILIB_H
#define _UILIB_H #define _UILIB_H
#include <windows.h>
#include <tchar.h>
typedef struct { typedef struct {
unsigned int idc; unsigned int idc;
int element_type; int element_type;

1
source/Z80VICE/daa.cpp
View File

@@ -24,6 +24,7 @@
* *
*/ */
#include "StdAfx.h"
#include "daa.h" #include "daa.h"
#include "../CommonVICE/types.h" // [AppleWin-TC] #include "../CommonVICE/types.h" // [AppleWin-TC]

2
source/Z80VICE/z80.cpp
View File

@@ -39,7 +39,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "../CommonVICE/6510core.h" // [AppleWin-TC] #include "../CommonVICE/6510core.h" // [AppleWin-TC]
#include "../CommonVICE/alarm.h" //#include "../CommonVICE/alarm.h" // [AppleWin-TC]
#include "daa.h" #include "daa.h"
//#include "debug.h" // [AppleWin-TC] //#include "debug.h" // [AppleWin-TC]
#include "../CommonVICE/interrupt.h" #include "../CommonVICE/interrupt.h"

3
source/Z80VICE/z80mem.cpp
View File

@@ -26,8 +26,7 @@
//#include "vice.h" //#include "vice.h"
#include <stdio.h> #include "StdAfx.h"
#include <string.h>
//#include "c128mem.h" // [AppleWin-TC] //#include "c128mem.h" // [AppleWin-TC]
//#include "c128mmu.h" //#include "c128mmu.h"