Commit b7533993 authored by Jens Gustedt's avatar Jens Gustedt
Browse files

Merge branch 'master' into HEAD

parents 3cc89176 aababbea
This diff is collapsed.
......@@ -2,6 +2,7 @@
/* */
/* Except for parts copied from previous work and as explicitly stated below, */
/* the authors and copyright holders for this work are as follows: */
/* (C) copyright 2013 Bobby */
/* (C) copyright 2010-2013 Jens Gustedt, INRIA, France */
/* (C) copyright 2013 Pierre-Nicolas Clauss */
/* (C) copyright 2012 William Morris */
......
......@@ -2,7 +2,7 @@
/* */
/* Except for parts copied from previous work and as explicitly stated below, */
/* the author and copyright holder for this work is */
/* (C) copyright 2012 Jens Gustedt, INRIA, France */
/* (C) copyright 2012-2013 Jens Gustedt, INRIA, France */
/* */
/* This file is free software; it is part of the P99 project. */
/* You can redistribute it and/or modify it under the terms of the QPL as */
......
......@@ -1273,30 +1273,48 @@ char const* p00_sprint_p99x_uintmax(p99x_uintmax p00_val, char*restrict p00_str,
#define P00_SPRINT_LIST() P00_SPRINT_LIST_(P99_EXT_ARITHMETIC_TYPES)
#define P00_SPRINT_FORMAT_(X, A, ...) \
P99_GENERIC((X), \
p00_sprint_voidp, \
(char*, p00_sprint_charp), \
(char const*, p00_sprint_charp), \
(char*const, p00_sprint_charp), \
(char const*const, p00_sprint_charp), \
(char*volatile, p00_sprint_charp), \
(char const*volatile, p00_sprint_charp), \
(char*const volatile, p00_sprint_charp), \
(char const*const volatile, p00_sprint_charp), \
(char*restrict, p00_sprint_charp), \
(char const*restrict, p00_sprint_charp), \
(char*const restrict, p00_sprint_charp), \
(char const*const restrict, p00_sprint_charp), \
(char*volatile restrict, p00_sprint_charp), \
(char const*volatile restrict, p00_sprint_charp), \
(char*const volatile restrict, p00_sprint_charp), \
(char const*const volatile restrict, p00_sprint_charp), \
__VA_ARGS__)((X), \
/* be sure not to have an array for the sizeof */ \
/* times a rough estimate for octal conversion */ \
/* plus a rough offset for floating points */ \
(char[(sizeof(X+0)*22+64)/8]){ 0 }, \
#define P00_SPRINT_FORMAT_(X, A, ...) \
P99_GENERIC((X)+0, \
p00_sprint_voidp, \
(char*, p00_sprint_charp), \
(char const*, p00_sprint_charp), \
(char*const, p00_sprint_charp), \
(char const*const, p00_sprint_charp), \
(char*volatile, p00_sprint_charp), \
(char const*volatile, p00_sprint_charp), \
(char*const volatile, p00_sprint_charp), \
(char const*const volatile, p00_sprint_charp), \
(char*restrict, p00_sprint_charp), \
(char const*restrict, p00_sprint_charp), \
(char*const restrict, p00_sprint_charp), \
(char const*const restrict, p00_sprint_charp), \
(char*volatile restrict, p00_sprint_charp), \
(char const*volatile restrict, p00_sprint_charp), \
(char*const volatile restrict, p00_sprint_charp), \
(char const*const volatile restrict, p00_sprint_charp), \
__VA_ARGS__)((X), \
P99_GENERIC((X)+0, \
/* be sure not to have an array for the sizeof */ \
/* times a rough estimate for octal conversion */ \
/* plus a rough offset for floating points */ \
(char[(sizeof(X+0)*22+64)/8]){ 0 }, \
(char*, 0), \
(char const*, 0), \
(char*const, 0), \
(char const*const, 0), \
(char*volatile, 0), \
(char const*volatile, 0), \
(char*const volatile, 0), \
(char const*const volatile, 0), \
(char*restrict, 0), \
(char const*restrict, 0), \
(char*const restrict, 0), \
(char const*const restrict, 0), \
(char*volatile restrict, 0), \
(char const*volatile restrict, 0), \
(char*const volatile restrict, 0), \
(char const*const volatile restrict, 0) \
), \
(A))
#define P00_SPRINT_FORMAT(...) P00_SPRINT_FORMAT_(__VA_ARGS__)
......
......@@ -2,7 +2,7 @@
/* */
/* Except for parts copied from previous work and as explicitly stated below, */
/* the authors and copyright holders for this work are as follows: */
/* (C) copyright 2010-2012 Jens Gustedt, INRIA, France */
/* (C) copyright 2010-2013 Jens Gustedt, INRIA, France */
/* (C) copyright 2012 William Morris */
/* */
/* This file is free software; it is part of the P99 project. */
......
/* This may look like nonsense, but it really is -*- mode: C -*- */
/* */
/* Except for parts copied from previous work and as explicitly stated below, */
/* the author and copyright holder for this work is */
/* the authors and copyright holders for this work are as follows: */
/* (C) copyright 2013 Bobby */
/* (C) copyright 2013 Jens Gustedt, INRIA, France */
/* */
/* This file is free software; it is part of the P99 project. */
......
......@@ -2,7 +2,7 @@
/* */
/* Except for parts copied from previous work and as explicitly stated below, */
/* the authors and copyright holders for this work are as follows: */
/* (C) copyright 2010-2012 Jens Gustedt, INRIA, France */
/* (C) copyright 2010-2013 Jens Gustedt, INRIA, France */
/* (C) copyright 2012 William Morris */
/* */
/* This file is free software; it is part of the P99 project. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment