Skip to content

Commit f734fd4

Browse files
author
ByteSizedFox
committed
move to stdint for definitions for better platform support
1 parent 3fdbf38 commit f734fd4

1 file changed

Lines changed: 14 additions & 335 deletions

File tree

‎include/port.h‎

Lines changed: 14 additions & 335 deletions
Original file line numberDiff line numberDiff line change
@@ -47,69 +47,6 @@
4747
#define _PORT_H
4848

4949
#include "dectalkf.h"
50-
51-
/*************************************************************************
52-
* WINDIC
53-
* Hack Job?
54-
*************************************************************************/
55-
56-
#ifdef WINDIC
57-
#include <stdio.h>
58-
59-
/*
60-
* fake out some MSDOS stuff
61-
*/
62-
#define __far
63-
#define _far
64-
#define far
65-
#define huge
66-
#define _huge
67-
#define volatile
68-
69-
#ifdef SEPARATE_PROCESSES
70-
#undef SEPARATE_PROCESSES
71-
#endif
72-
73-
typedef unsigned short DT_PIPE_T;
74-
typedef int S32;
75-
typedef unsigned int U32;
76-
typedef short S16;
77-
typedef unsigned short U16;
78-
79-
#endif //WINDIC
80-
81-
82-
/*
83-
************************************************************************
84-
* defines for MSDOS
85-
*/
86-
#ifdef MSDOS
87-
88-
#ifdef SEPARATE_PROCESSES
89-
#undef SEPARATE_PROCESSES
90-
#endif
91-
92-
typedef unsigned short DT_PIPE_T;
93-
typedef long S32;
94-
typedef unsigned long U32;
95-
typedef int S16;
96-
typedef unsigned int U16;
97-
typedef signed char S8;
98-
typedef unsigned char U8;
99-
100-
#endif
101-
102-
/*
103-
************************************************************************
104-
* defines for DEC OSF/1 AXP & UNIXs
105-
*/
106-
#if defined (__osf__) || defined (__unix__) || defined (__EMSCRIPTEN__) || defined (__APPLE__)
107-
108-
/*#define ENGLISH_US 1*/
109-
110-
/* GL 04/21/1997 add this for OSF build */
111-
//#include "opthread.h"
112-
11350
#include <unistd.h>
11451
#include <stdio.h>
11552

@@ -121,225 +58,26 @@ typedef unsigned char U8;
12158
#define far
12259
#define huge
12360
#define _huge
124-
#if !(defined __unix__ || defined __EMSCRIPTEN__ || defined (__APPLE__)) || 1
12561
#define volatile
126-
#endif
127-
128-
typedef unsigned short DT_PIPE_T;
129-
typedef int S32;
130-
typedef unsigned int U32;
131-
typedef short S16;
132-
typedef unsigned short U16;
133-
typedef signed char S8;
134-
typedef unsigned char U8;
135-
136-
#ifdef __osf__
137-
typedef unsigned long QWORD;
138-
#endif
139-
#if defined __unix__ || defined __EMSCRIPTEN__ || defined (__APPLE__) || defined _WIN32
140-
typedef unsigned long long QWORD;
141-
#endif
14262

143-
/* GL 04/21/1997 add this for OSF build */
144-
#ifndef _DWORD
145-
#define _DWORD
146-
typedef U32 DWORD;
147-
#endif
148-
typedef U16 USHORT;
63+
#include <stdint.h>
64+
65+
typedef uint16_t DT_PIPE_T;
66+
typedef int32_t S32;
67+
typedef uint32_t U32;
68+
typedef int16_t S16;
69+
typedef uint16_t U16;
70+
typedef int8_t S8;
71+
typedef uint8_t U8;
72+
typedef uint64_t QWORD;
73+
typedef uint32_t DWORD;
74+
typedef uint16_t USHORT;
14975
typedef void * PVOID;
150-
#ifndef _UINT
151-
#define _UINT
152-
typedef U32 UINT;
153-
#endif
76+
typedef uint32_t UINT;
15477
#define IsBadWritePtr(ptr, size) ((ptr == NULL) ? 1 : 0)
15578
#define _stricmp strcasecmp
15679
#define PRINTFDEBUG_OLD
157-
158-
#if defined(_WIN64) || defined(_LP64)
159-
typedef QWORD PTRINT;
160-
#else
161-
typedef DWORD PTRINT;
162-
#endif
163-
164-
#endif
165-
166-
/*
167-
************************************************************************
168-
* defines for DEC MIPS
169-
*/
170-
#ifdef UNIX_AND_MIPS
171-
172-
#include <stdio.h>
173-
174-
/*
175-
* fake out some MSDOS stuff
176-
*/
177-
#define __far
178-
#define _far
179-
#define far
180-
#define huge
181-
#define volatile
182-
183-
typedef unsigned short DT_PIPE_T;
184-
typedef int S32;
185-
typedef unsigned int U32;
186-
typedef short S16;
187-
typedef unsigned short U16;
188-
typedef signed char S8;
189-
typedef unsigned char U8;
190-
191-
#endif
192-
193-
/*
194-
************************************************************************
195-
* WINDOWS/NT
196-
*/
197-
#ifdef WIN32_OLD
198-
199-
#include <windows.h>
200-
#include <stdio.h>
201-
202-
/*
203-
* fake out some MSDOS stuff
204-
*/
205-
206-
#define __far
207-
#define _far
208-
#define far
209-
#define huge
210-
#define volatile
211-
212-
#ifdef SEPARATE_PROCESSES
213-
#undef SEPARATE_PROCESSES
214-
#endif
215-
216-
typedef unsigned short DT_PIPE_T;
217-
typedef int S32;
218-
typedef unsigned int U32;
219-
typedef short S16;
220-
typedef unsigned short U16;
221-
typedef signed char S8;
222-
typedef unsigned char U8;
223-
typedef unsigned _int64 QWORD, * PQWORD; //tek 04aug97 sapi fixes
224-
225-
typedef HANDLE DT_HANDLE;
226-
typedef DT_HANDLE HTHREAD_T;
227-
typedef DT_HANDLE HEVENT_T;
228-
typedef CRITICAL_SECTION MUTEX_T;
229-
typedef MUTEX_T * HMUTEX_T;
230-
231-
#if !(defined OLEDECTALK) && !(defined SAPI5DECTALK)
232-
#include "playaudd.h"
233-
typedef PLAY_AUDIO_T * LPAUDIO_HANDLE_T;
234-
#endif //OLEDECTALK
235-
236-
#endif //WIN32_OLD
237-
238-
// #define __osf__
239-
240-
241-
/* vxworks stuff */
242-
#if defined VXWORKS
243-
244-
/*#define ENGLISH_US 1*/
245-
246-
/* GL 04/21/1997 add this for OSF build */
247-
//#include "opthread.h"
248-
249-
#include <unistd.h>
250-
#include <stdio.h>
251-
252-
/*
253-
* fake out some MSDOS stuff
254-
*/
255-
#define __far
256-
#define _far
257-
#define far
258-
#define huge
259-
#define _huge
260-
261-
typedef unsigned short DT_PIPE_T;
262-
typedef int S32;
263-
typedef unsigned int U32;
264-
typedef short S16;
265-
typedef unsigned short U16;
266-
typedef signed char S8;
267-
typedef unsigned char U8;
268-
269-
typedef unsigned long long QWORD;
270-
271-
/* GL 04/21/1997 add this for OSF build */
272-
#ifndef _DWORD
273-
#define _DWORD
274-
typedef U32 DWORD;
275-
#endif
276-
typedef void * PVOID;
277-
278-
#define _inline inline
279-
280-
#define IsBadWritePtr(ptr, size) ((ptr == NULL) ? 1 : 0)
281-
//#define _stricmp strcasecmp
282-
#define PRINTFDEBUG_OLD
283-
#endif
284-
285-
286-
/* stuff for sparc/Solaris */
287-
#if defined __sun && defined __sparc
288-
#ifndef _SPARC_SOLARIS_
289-
#define _SPARC_SOLARIS_
290-
#endif
291-
#ifndef _BIGENDIAN_
292-
#define _BIGENDIAN_
293-
#endif
294-
#endif
295-
296-
#ifdef _SPARC_SOLARIS_
297-
//#include "opthread.h"
298-
299-
#include <unistd.h>
300-
#include <stdio.h>
301-
302-
/*
303-
* fake out some MSDOS stuff
304-
*/
305-
#define __far
306-
#define _far
307-
#define far
308-
#define huge
309-
#define _huge
310-
//#ifndef __unix__
311-
//#define volatile
312-
//#endif
313-
314-
typedef unsigned short DT_PIPE_T;
315-
typedef int S32;
316-
typedef unsigned int U32;
317-
typedef short S16;
318-
typedef unsigned short U16;
319-
typedef signed char S8;
320-
typedef unsigned char U8;
321-
322-
typedef unsigned long long QWORD;
323-
324-
#define _inline
325-
#define __inline
326-
327-
/* GL 04/21/1997 add this for OSF build */
328-
#ifndef _DWORD
329-
#define _DWORD
330-
typedef U32 DWORD;
331-
#endif
332-
typedef U16 USHORT;
333-
typedef void * PVOID;
334-
#ifndef _UINT
335-
#define _UINT
336-
typedef U32 UINT;
337-
#endif
338-
#define IsBadWritePtr(ptr, size) ((ptr == NULL) ? 1 : 0)
339-
#define _stricmp strcasecmp
340-
#define PRINTFDEBUG_OLD
341-
#endif
342-
80+
typedef uint64_t PTRINT;
34381

34482
/* SWAP_dd_eeeeeee */
34583
/* dd is 16 or 32 bits */
@@ -369,65 +107,6 @@ typedef U32 UINT;
369107
#define SWAP_32_BIG(x) (x)
370108
#endif
371109

372-
#ifndef SUN_ULAW
373-
#define SUN_ULAW 1
374-
#define SUN_LIN_8 2
375-
#define SUN_LIN_16 3
376-
#endif
377-
378-
/*
379-
************************************************************************
380-
* ARM7TDMI
381-
*/
382-
#ifdef ARM7
383-
384-
#ifndef ARM7_NOSWI
385-
#include <stdio.h>
386-
#endif
387-
#include <stdlib.h>
388-
#include <string.h>
389-
390-
/*
391-
* fake out some MSDOS stuff
392-
*/
393-
394-
#define __far
395-
#define _far
396-
#define far
397-
#define huge
398-
#define volatile
399-
400-
#ifdef SEPARATE_PROCESSES
401-
#undef SEPARATE_PROCESSES
402-
#endif
403-
404-
typedef unsigned short DT_PIPE_T;
405-
typedef long S32;
406-
typedef unsigned long U32;
407-
typedef short S16;
408-
typedef unsigned short U16;
409-
typedef signed char S8;
410-
typedef unsigned char U8;
411-
typedef unsigned long DWORD;
412-
//typedef unsigned _int64 QWORD, * PQWORD; //tek 04aug97 sapi fixes
413-
414-
typedef void * DT_HANDLE;
415-
typedef void * LPVOID;
416-
typedef void * PVOID;
417-
typedef long MMRESULT;
418-
419-
//typedef DT_HANDLE HTHREAD_T;
420-
//typedef DT_HANDLE HEVENT_T;
421-
//typedef CRITICAL_SECTION MUTEX_T;
422-
//typedef MUTEX_T * HMUTEX_T;
423-
424-
#ifdef EPSON_ARM7
425-
#include "ltsnames.h"
426-
#endif
427-
428-
429-
#endif //ARM7
430-
431110
/**
432111
* Emscripten Support!
433112
*/

0 commit comments

Comments
 (0)