#include <string.h>
#include "dstr.h"
+#include "macros.h"
#include "url.h"
/*----- Main code ---------------------------------------------------------*/
case ' ': DPUTC(d, '+');
break;
default:
- if (isspace((unsigned char)*p)) goto unsafe;
- else if (isalnum((unsigned char)*p)) goto safe;
+ if (ISSPACE(*p)) goto unsafe;
+ else if (ISALNUM(*p)) goto safe;
else if (ctx->f&URLF_LAX) goto safe;
else goto unsafe;
case '/': case '~':