[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[avr-libc-commit] [2281] Remove depricated PROGMEM types.
From: |
Dmitry Xmelkov |
Subject: |
[avr-libc-commit] [2281] Remove depricated PROGMEM types. |
Date: |
Thu, 05 Jan 2012 03:43:44 +0000 |
Revision: 2281
http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2281
Author: dmix
Date: 2012-01-05 03:43:44 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Remove depricated PROGMEM types.
Modified Paths:
--------------
trunk/avr-libc/ChangeLog
trunk/avr-libc/tests/simulate/pmstring/memccpy_P.c
trunk/avr-libc/tests/simulate/stdlib/realloc-3.c
trunk/avr-libc/tests/simulate/string/memccpy.c
Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog 2012-01-05 03:32:38 UTC (rev 2280)
+++ trunk/avr-libc/ChangeLog 2012-01-05 03:43:44 UTC (rev 2281)
@@ -1,5 +1,11 @@
2012-01-05 Dmitry Xmelkov <address@hidden>
+ * tests/simulate/stdlib/realloc-3.c: Remove depricated PROGMEM types.
+ * tests/simulate/pmstring/memccpy_P.c: Same.
+ * tests/simulate/string/memccpy.c: Same.
+
+2012-01-05 Dmitry Xmelkov <address@hidden>
+
Exclude worses with old GCC versions.
* configure.ac: Insert space after '-o' option (needed for GCC 3.3).
* tests/simulate/runtest.sh: Remove '-std=gnu99' option for
Modified: trunk/avr-libc/tests/simulate/pmstring/memccpy_P.c
===================================================================
--- trunk/avr-libc/tests/simulate/pmstring/memccpy_P.c 2012-01-05 03:32:38 UTC
(rev 2280)
+++ trunk/avr-libc/tests/simulate/pmstring/memccpy_P.c 2012-01-05 03:43:44 UTC
(rev 2281)
@@ -41,7 +41,6 @@
# define EXIT(code) exit ((code) < 255 ? (code) : 100 + (code) % 100)
# define memccpy_P memccpy
# define memcmp_P memcmp
-# define prog_void void
#else
# define PRINTFLN(args...)
# define EXIT(code) exit (code)
@@ -52,9 +51,9 @@
*/
static void
Check (int line,
- const prog_void *src , int val, size_t len, /* memccpy() args */
+ const void *src , int val, size_t len, /* memccpy_P() args */
int expret, /* expecter return */
- const prog_void *expdst, size_t explen) /* expected result */
+ const void *expdst, size_t explen) /* expected result */
{
char tdst[len];
char *p;
Modified: trunk/avr-libc/tests/simulate/stdlib/realloc-3.c
===================================================================
--- trunk/avr-libc/tests/simulate/stdlib/realloc-3.c 2012-01-05 03:32:38 UTC
(rev 2280)
+++ trunk/avr-libc/tests/simulate/stdlib/realloc-3.c 2012-01-05 03:43:44 UTC
(rev 2281)
@@ -41,7 +41,6 @@
#include "../../libc/stdlib/stdlib_private.h"
#else
#include "progmem.h"
-# define prog_char char
#endif
/*
@@ -155,7 +154,7 @@
size_t __malloc_margin;
#endif
-#define S(i,s) static prog_char string##i[] = s
+#define S(i,s) static const char string##i[] PROGMEM = s
S(0, "The ");
S(1, "quick ");
@@ -166,12 +165,12 @@
S(6, "the lazy ");
S(7, "dog. ");
-static prog_char *strings[8] = {
+static const char *strings[8] = {
string0, string1, string2, string3, string4, string5, string6, string7
};
static uint8_t s_idx;
-static prog_char *cur_c;
+static const char *cur_c;
/*
* Simulates e.g. a serial receiver. "Receives" characters from some
Modified: trunk/avr-libc/tests/simulate/string/memccpy.c
===================================================================
--- trunk/avr-libc/tests/simulate/string/memccpy.c 2012-01-05 03:32:38 UTC
(rev 2280)
+++ trunk/avr-libc/tests/simulate/string/memccpy.c 2012-01-05 03:43:44 UTC
(rev 2281)
@@ -40,7 +40,6 @@
printf ("\n%s:%d: " fmt "\n", __FILE__, line, ##__VA_ARGS__);
# define EXIT(code) exit ((code) < 255 ? (code) : 100 + (code) % 100)
# define memcmp_P memcmp
-# define prog_void void
#else
# define PRINTFLN(args...)
# define EXIT(code) exit (code)
@@ -51,9 +50,9 @@
*/
static void
Check (int line,
- const prog_void *src , int val, size_t len, /* memccpy() args */
+ const void *src , int val, size_t len, /* memccpy() args */
int expret, /* expecter return */
- const prog_void *expdst, size_t explen) /* expected result */
+ const void *expdst, size_t explen) /* expected result */
{
char tsrc[len];
char tdst[len];
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [avr-libc-commit] [2281] Remove depricated PROGMEM types.,
Dmitry Xmelkov <=