From 5053e8dfae0be9764bedf5448e59e7a16472fd22 Mon Sep 17 00:00:00 2001
From: Kristian Sloth Lauszus <lauszus@gmail.com>
Date: Wed, 22 Apr 2015 15:48:18 +0200
Subject: [PATCH] Don't use deprecated prog_ macro

Fixes: #147
---
 examples/USB_desc/USB_desc.ino |  2 +-
 examples/hub_demo/hub_demo.ino |  2 +-
 version_helper.h               | 28 ----------------------------
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/examples/USB_desc/USB_desc.ino b/examples/USB_desc/USB_desc.ino
index 1af80340..4dc9a780 100644
--- a/examples/USB_desc/USB_desc.ino
+++ b/examples/USB_desc/USB_desc.ino
@@ -340,7 +340,7 @@ void printunkdescr( uint8_t* descr_ptr )
 
 
 /* Print a string from Program Memory directly to save RAM */
-void printProgStr(prog_char str[])
+void printProgStr(const char* str)
 {
   char c;
   if(!str) return;
diff --git a/examples/hub_demo/hub_demo.ino b/examples/hub_demo/hub_demo.ino
index e8dc6ab9..81aae805 100644
--- a/examples/hub_demo/hub_demo.ino
+++ b/examples/hub_demo/hub_demo.ino
@@ -336,7 +336,7 @@ void printunkdescr( uint8_t* descr_ptr )
 
 
 /* Print a string from Program Memory directly to save RAM */
-void printProgStr(prog_char str[])
+void printProgStr(const char* str)
 {
   char c;
   if(!str) return;
diff --git a/version_helper.h b/version_helper.h
index b018000e..0cb3b4ad 100644
--- a/version_helper.h
+++ b/version_helper.h
@@ -53,34 +53,6 @@ e-mail   :  support@circuitsathome.com
 #define _SFR_BYTE(n) (n)
 #endif
 
-#ifndef prog_void
-typedef void prog_void;
-#endif
-#ifndef prog_char
-typedef char prog_char;
-#endif
-#ifndef prog_uchar
-typedef unsigned char prog_uchar;
-#endif
-#ifndef prog_int8_t
-typedef int8_t prog_int8_t;
-#endif
-#ifndef prog_uint8_t
-typedef uint8_t prog_uint8_t;
-#endif
-#ifndef prog_int16_t
-typedef int16_t prog_int16_t;
-#endif
-#ifndef prog_uint16_t
-typedef uint16_t prog_uint16_t;
-#endif
-#ifndef prog_int32_t
-typedef int32_t prog_int32_t;
-#endif
-#ifndef prog_uint32_t
-typedef uint32_t prog_uint32_t;
-#endif
-
 #ifndef memchr_P
 #define memchr_P(str, c, len) memchr((str), (c), (len))
 #endif