Don't generate ifndef's in bits.h. Instead, use them when building

the program.  This makes it possible to include bits.h without having
defined all HAVE_INT17_T symbols.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3343 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-09-02 18:46:16 +00:00
parent d121635e4c
commit 7f9972ff58

View File

@@ -66,21 +66,42 @@ void strupr(char *s)
sprintf(tmp2, "typedef %s %s;", #TYPE, tmp); \ sprintf(tmp2, "typedef %s %s;", #TYPE, tmp); \
strupr(tmp); \ strupr(tmp); \
tabs = 5 - strlen(tmp2) / 8; \ tabs = 5 - strlen(tmp2) / 8; \
fprintf(f, "#ifndef HAVE_%s\n", tmp); \
fprintf(f, "#define HAVE_%s\n", tmp); \
fprintf(f, "%s", tmp2); \ fprintf(f, "%s", tmp2); \
while(tabs-- > 0) fprintf(f, "\t"); \ while(tabs-- > 0) fprintf(f, "\t"); \
fprintf(f, "/* %2d bits */\n", b); \ fprintf(f, "/* %2d bits */\n", b); \
fprintf(f, "#endif /* HAVE_%s */\n", tmp); \ return; \
continue; \
} \ } \
} }
static void
try_signed(FILE *f, int len)
{
BITSIZE(signed char);
BITSIZE(short);
BITSIZE(int);
BITSIZE(long);
#ifdef HAVE_LONG_LONG
BITSIZE(long long);
#endif
fprintf(f, "/* There is no %d bit type */\n", len);
}
static void
try_unsigned(FILE *f, int len)
{
BITSIZE(unsigned char);
BITSIZE(unsigned short);
BITSIZE(unsigned int);
BITSIZE(unsigned long);
#ifdef HAVE_LONG_LONG
BITSIZE(unsigned long long);
#endif
fprintf(f, "/* There is no %d bit type */\n", len);
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int i, b, len;
FILE *f; FILE *f;
int sizes[] = { 8, 16, 32, 64 };
if(argc < 2) if(argc < 2)
f = stdout; f = stdout;
@@ -109,31 +130,33 @@ int main(int argc, char **argv)
fprintf(f, "#ifndef __BIT_TYPES_DEFINED__\n"); fprintf(f, "#ifndef __BIT_TYPES_DEFINED__\n");
fprintf(f, "#define __BIT_TYPES_DEFINED__\n"); fprintf(f, "#define __BIT_TYPES_DEFINED__\n");
fprintf(f, "\n"); fprintf(f, "\n");
for(i = 0; i < sizeof(sizes) / sizeof(sizes[0]); i++){
len = sizes[i]; #ifndef HAVE_INT8_T
BITSIZE(signed char); try_signed (f, 8);
BITSIZE(short); #endif /* HAVE_INT8_T */
BITSIZE(int); #ifndef HAVE_INT16_T
BITSIZE(long); try_signed (f, 16);
#ifdef HAVE_LONG_LONG #endif /* HAVE_INT16_T */
BITSIZE(long long); #ifndef HAVE_INT32_T
#endif try_signed (f, 32);
fprintf(f, "/* There is no %d bit type */\n", len); #endif /* HAVE_INT32_T */
break; #ifndef HAVE_INT64_T
} try_signed (f, 64);
fprintf(f, "\n"); #endif /* HAVE_INT64_T */
for(i = 0; i < sizeof(sizes) / sizeof(sizes[0]); i++){
len = sizes[i]; #ifndef HAVE_U_INT8_T
BITSIZE(unsigned char); try_unsigned (f, 8);
BITSIZE(unsigned short); #endif /* HAVE_INT8_T */
BITSIZE(unsigned int); #ifndef HAVE_U_INT16_T
BITSIZE(unsigned long); try_unsigned (f, 16);
#ifdef HAVE_LONG_LONG #endif /* HAVE_U_INT16_T */
BITSIZE(unsigned long long); #ifndef HAVE_U_INT32_T
#endif try_unsigned (f, 32);
fprintf(f, "/* There is no %d bit type */\n", len); #endif /* HAVE_U_INT32_T */
break; #ifndef HAVE_U_INT64_T
} try_unsigned (f, 64);
#endif /* HAVE_U_INT64_T */
fprintf(f, "\n"); fprintf(f, "\n");
fprintf(f, "#endif /* __BIT_TYPES_DEFINED__ */\n"); fprintf(f, "#endif /* __BIT_TYPES_DEFINED__ */\n");
fprintf(f, "\n"); fprintf(f, "\n");