X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=includes%2Fstdint.h;h=5d387d91c675ad2e9e4532564b87b1bfd86d00a0;hb=d865c4403fc91d1f1ac95ba76febcee9f429bb97;hp=50d3a6e30cc299072009779761ee5f86346cf69d;hpb=4c805021b487dff9bfc6341c998ba99636416ae7;p=pdclib diff --git a/includes/stdint.h b/includes/stdint.h index 50d3a6e..5d387d9 100644 --- a/includes/stdint.h +++ b/includes/stdint.h @@ -1,8 +1,4 @@ -/* $Id$ */ - -/* Release $Name$ */ - -/* 7.18 Integer types +/* Integer types This file is part of the Public Domain C Library (PDCLib). Permission is granted to use, modify, and / or redistribute at will. @@ -11,10 +7,7 @@ #ifndef _PDCLIB_STDINT_H #define _PDCLIB_STDINT_H _PDCLIB_STDINT_H -#ifndef _PDCLIB_INT_H -#define _PDCLIB_INT_H _PDCLIB_INT_H -#include <_PDCLIB_int.h> -#endif +#include "_PDCLIB_int.h" /* 7.18.1.1 Exact-width integer types. */ @@ -189,17 +182,17 @@ typedef _PDCLIB_uintmax_t uintmax_t; /* Expand to an integer constant of specified value and type int_leastN_t */ -#define INT8_C( value ) concat( value, _PDCLIB_INT8_LITERAL ) -#define INT16_C( value ) concat( value, _PDCLIB_INT16_LITERAL ) -#define INT32_C( value ) concat( value, _PDCLIB_INT32_LITERAL ) -#define INT64_C( value ) concat( value, _PDCLIB_INT64_LITERAL ) +#define INT8_C( value ) value +#define INT16_C( value ) value +#define INT32_C( value ) _PDCLIB_concat( value, _PDCLIB_INT32_LITERAL ) +#define INT64_C( value ) _PDCLIB_concat( value, _PDCLIB_INT64_LITERAL ) /* Expand to an integer constant of specified value and type uint_leastN_t */ -#define UINT8_C( value ) concat( value, _PDCLIB_UINT8_LITERAL ) -#define UINT16_C( value ) concat( value, _PDCLIB_UINT16_LITERAL ) -#define UINT32_C( value ) concat( value, _PDCLIB_UINT32_LITERAL ) -#define UINT64_C( value ) concat( value, _PDCLIB_UINT64_LITERAL ) +#define UINT8_C( value ) value +#define UINT16_C( value ) value +#define UINT32_C( value ) _PDCLIB_concat( value, _PDCLIB_UINT32_LITERAL ) +#define UINT64_C( value ) _PDCLIB_concat( value, _PDCLIB_UINT64_LITERAL ) /* 7.18.4.2 Macros for greatest-width integer constants */ @@ -212,4 +205,3 @@ typedef _PDCLIB_uintmax_t uintmax_t; #endif #endif -