Replace standard types with stdint.h types. Replace #define types with typedefs. Rename all typedefs to have a _t extension. Add #defines to automatically convert old FreeRTOS specific types to their new names (with the _t).

diff --git a/FreeRTOS/Source/portable/MPLAB/PIC18F/portmacro.h b/FreeRTOS/Source/portable/MPLAB/PIC18F/portmacro.h
index 3327499..f61ab0b 100644
--- a/FreeRTOS/Source/portable/MPLAB/PIC18F/portmacro.h
+++ b/FreeRTOS/Source/portable/MPLAB/PIC18F/portmacro.h

@@ -1,5 +1,5 @@
 /*

-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. 

+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.

     All rights reserved

 

     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.

@@ -67,7 +67,7 @@
 #define PORTMACRO_H

 

 /*-----------------------------------------------------------

- * Port specific definitions.  

+ * Port specific definitions.

  *

  * The settings in this file configure FreeRTOS correctly for the

  * given hardware and compiler.

@@ -82,15 +82,19 @@
 #define portDOUBLE		double

 #define portLONG		long

 #define portSHORT		int

-#define portSTACK_TYPE	unsigned char

+#define portSTACK_TYPE	uint8_t

 #define portBASE_TYPE	char

 

+typedef portSTACK_TYPE StackType_t;

+typedef signed char BaseType_t;

+typedef unsigned char UBaseType_t;

+

 #if( configUSE_16_BIT_TICKS == 1 )

-	typedef unsigned portSHORT portTickType;

-	#define portMAX_DELAY ( portTickType ) 0xffff

+	typedef uint16_t TickType_t;

+	#define portMAX_DELAY ( TickType_t ) 0xffff

 #else

-	typedef unsigned portLONG portTickType;

-	#define portMAX_DELAY ( portTickType ) 0xffffffffUL

+	typedef uint32_t TickType_t;

+	#define portMAX_DELAY ( TickType_t ) 0xffffffffUL

 #endif

 /*-----------------------------------------------------------*/

 

@@ -98,7 +102,7 @@
 #define portBYTE_ALIGNMENT			1

 #define portGLOBAL_INT_ENABLE_BIT	0x80

 #define portSTACK_GROWTH			1

-#define portTICK_RATE_MS			( ( portTickType ) 1000 / configTICK_RATE_HZ )		

+#define portTICK_RATE_MS			( ( TickType_t ) 1000 / configTICK_RATE_HZ )

 /*-----------------------------------------------------------*/

 

 /* Critical section management. */