summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2005-11-26 07:29:48 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2005-11-26 07:29:48 +0000
commit9b539d863434b6c97efcdf08f0b3c8986adf6077 (patch)
treedd47eddec766b7979aa6a79a86f1ca5a82bdc057 /src
parent128bc2184274dfc807f7d3a212bc3e0f954ad62a (diff)
downloadcoreutils-9b539d863434b6c97efcdf08f0b3c8986adf6077.tar.xz
(unsigned_long_long_int): Renamed from ulonglong_t,
to avoid collision with POSIX name space. All uses changed.
Diffstat (limited to 'src')
-rw-r--r--src/od.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/od.c b/src/od.c
index 2f48ab5aa..5334db23e 100644
--- a/src/od.c
+++ b/src/od.c
@@ -60,11 +60,11 @@ typedef double LONG_DOUBLE;
#endif
#if HAVE_UNSIGNED_LONG_LONG
-typedef unsigned long long int ulonglong_t;
+typedef unsigned long long int unsigned_long_long_int;
#else
/* This is just a place-holder to avoid a few `#if' directives.
In this case, the type isn't actually used. */
-typedef unsigned long int ulonglong_t;
+typedef unsigned long int unsigned_long_long_int;
#endif
enum size_spec
@@ -144,7 +144,7 @@ static unsigned int const bytes_to_unsigned_dec_digits[] =
static unsigned int const bytes_to_hex_digits[] =
{0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32};
-#define MAX_INTEGRAL_TYPE_SIZE sizeof (ulonglong_t)
+#define MAX_INTEGRAL_TYPE_SIZE sizeof (unsigned_long_long_int)
/* It'll be a while before we see integral types wider than 16 bytes,
but if/when it happens, this check will catch it. Without this check,
@@ -165,7 +165,7 @@ static const int width_bytes[] =
sizeof (short int),
sizeof (int),
sizeof (long int),
- sizeof (ulonglong_t),
+ sizeof (unsigned_long_long_int),
sizeof (float),
sizeof (double),
sizeof (LONG_DOUBLE)
@@ -454,7 +454,7 @@ print_long (size_t n_bytes, void const *block, char const *fmt_string)
static void
print_long_long (size_t n_bytes, void const *block, char const *fmt_string)
{
- ulonglong_t const *p = block;
+ unsigned_long_long_int const *p = block;
size_t i;
for (i = n_bytes / sizeof *p; i != 0; i--)
printf (fmt_string, *p++);
@@ -1584,7 +1584,7 @@ main (int argc, char **argv)
#if HAVE_UNSIGNED_LONG_LONG
/* If `long int' and `long long int' have the same size, it's fine
to overwrite the entry for `long' with this one. */
- integral_type_size[sizeof (ulonglong_t)] = LONG_LONG;
+ integral_type_size[sizeof (unsigned_long_long_int)] = LONG_LONG;
#endif
for (i = 0; i <= MAX_FP_TYPE_SIZE; i++)