nanogui: [patch] windef.h enhancements for VxWorks
Subject:
[patch] windef.h enhancements for VxWorks
From:
Brent Thompson ####@####.####
Date:
9 Oct 2000 19:24:51 -0000
Message-Id: <39E21AAA.3080601@nlc.com>
Here's the guts of the changes needed for the Microwindows
port to VxWorks. There are some typedef conflicts between
the two systems (UCHAR/USHORT/ULONG/UINT/BOOL) which are
handled with proper timing of includes and ifdefs.
BAT
--
Brent A. Thompson, Next Level Communications <www.nlc.com>
1776 22nd Street #100, West Des Moines, IA 50266-1444
EMail: ####@####.#### Phone: (515)991-3853
*** windef.h_0.88 Mon Oct 9 11:13:20 2000
--- windef.h Mon Oct 9 14:15:22 2000
***************
*** 5,12 ****
--- 5,22 ----
* Win32 API base type definitions
*/
+ #ifndef _WINDEF_H
#define _WINDEF_H
+
+ #ifdef VXWORKS
+ /* Don't include the internal Tornado header file <ntcontext.h>, **
+ ** as the definitions in it conflict with these definitions. */
+ #define __INCntcontexth
+ #include <vxWorks.h>
+ #endif
+
+
#ifndef NULL
#define NULL ((void *)0)
#endif
***************
*** 51,74 ****
#ifndef __ITRON_TYPES_h_ /* FIXME RTEMS hack*/
#ifndef COMMON_H /* MiniGUI hack*/
- typedef int BOOL;
#endif
#endif
typedef unsigned char UCHAR;
typedef unsigned long ULONG;
typedef ULONG * PULONG;
- typedef unsigned short USHORT;
typedef USHORT * PUSHORT;
typedef UCHAR * PUCHAR;
typedef char * PSZ;
typedef int INT;
- typedef unsigned int UINT;
typedef unsigned int *PUINT;
typedef unsigned long DWORD;
typedef unsigned char BYTE;
typedef unsigned short WORD;
typedef float FLOAT;
typedef FLOAT *PFLOAT;
typedef BOOL NEAR *PBOOL;
--- 61,88 ----
#ifndef __ITRON_TYPES_h_ /* FIXME RTEMS hack*/
#ifndef COMMON_H /* MiniGUI hack*/
#endif
#endif
+ #ifndef VXWORKS
typedef unsigned char UCHAR;
+ typedef unsigned short USHORT;
typedef unsigned long ULONG;
+ typedef unsigned int UINT;
+ typedef int BOOL;
+ #endif
+
typedef ULONG * PULONG;
typedef USHORT * PUSHORT;
typedef UCHAR * PUCHAR;
typedef char * PSZ;
typedef int INT;
typedef unsigned int *PUINT;
typedef unsigned long DWORD;
typedef unsigned char BYTE;
typedef unsigned short WORD;
+
typedef float FLOAT;
typedef FLOAT *PFLOAT;
typedef BOOL NEAR *PBOOL;
***************
*** 157,159 ****
--- 171,177 ----
typedef HANDLE HMENU;
typedef LRESULT (CALLBACK* WNDPROC)(HWND, UINT, WPARAM, LPARAM);
+
+
+ #endif /* _WINDEF_H */
+
