Skip to content

Commit 39ecb8b

Browse files
svaaralasvaarala
committed
Source fixes for #ifdef and #ifndef convention
1 parent 04411af commit 39ecb8b

67 files changed

Lines changed: 249 additions & 249 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src-input/duk_api_call.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ DUK_EXTERNAL void duk_new(duk_context *ctx, duk_idx_t nargs) {
414414
* stack reflects the caller which is correct.
415415
*/
416416

417-
#ifdef DUK_USE_AUGMENT_ERROR_CREATE
417+
#if defined(DUK_USE_AUGMENT_ERROR_CREATE)
418418
duk_hthread_sync_currpc(thr);
419419
duk_err_augment_error_create(thr, thr, NULL, 0, 1 /*noblame_fileline*/);
420420
#endif

‎src-input/duk_api_internal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* to the public API.
44
*/
55

6-
#ifndef DUK_API_INTERNAL_H_INCLUDED
6+
#if !defined(DUK_API_INTERNAL_H_INCLUDED)
77
#define DUK_API_INTERNAL_H_INCLUDED
88

99
/* duk_push_sprintf constants */

‎src-input/duk_api_public.h.in‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ struct duk_time_components {
105105
*/
106106

107107
/* Duktape version, (major * 10000) + (minor * 100) + patch. Allows C code
108-
* to #ifdef against Duktape API version. The same value is also available
109-
* to Ecmascript code in Duktape.version. Unofficial development snapshots
110-
* have 99 for patch level (e.g. 0.10.99 would be a development version
111-
* after 0.10.0 but before the next official release).
108+
* to #if (DUK_VERSION >= NNN) against Duktape API version. The same value
109+
* is also available to Ecmascript code in Duktape.version. Unofficial
110+
* development snapshots have 99 for patch level (e.g. 0.10.99 would be a
111+
* development version after 0.10.0 but before the next official release).
112112
*/
113113
#define DUK_VERSION 19999L
114114

@@ -252,7 +252,7 @@ struct duk_time_components {
252252
* which is ugly and not thread safe.
253253
*/
254254

255-
#ifndef DUK_API_VARIADIC_MACROS
255+
#if !defined(DUK_API_VARIADIC_MACROS)
256256
DUK_EXTERNAL_DECL const char *duk_api_global_filename;
257257
DUK_EXTERNAL_DECL duk_int_t duk_api_global_line;
258258
#endif

‎src-input/duk_api_stack.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ DUK_LOCAL_DECL duk_idx_t duk__push_c_function_raw(duk_context *ctx, duk_c_functi
2222
* Global state for working around missing variadic macros
2323
*/
2424

25-
#ifndef DUK_USE_VARIADIC_MACROS
25+
#if !defined(DUK_USE_VARIADIC_MACROS)
2626
DUK_EXTERNAL const char *duk_api_global_filename = NULL;
2727
DUK_EXTERNAL duk_int_t duk_api_global_line = 0;
2828
#endif
@@ -561,7 +561,7 @@ DUK_LOCAL duk_bool_t duk__resize_valstack(duk_context *ctx, duk_size_t new_size)
561561
duk_ptrdiff_t old_bottom_offset;
562562
duk_ptrdiff_t old_top_offset;
563563
duk_ptrdiff_t old_end_offset_post;
564-
#ifdef DUK_USE_DEBUG
564+
#if defined(DUK_USE_DEBUG)
565565
duk_ptrdiff_t old_end_offset_pre;
566566
duk_tval *old_valstack_pre;
567567
duk_tval *old_valstack_post;
@@ -582,7 +582,7 @@ DUK_LOCAL duk_bool_t duk__resize_valstack(duk_context *ctx, duk_size_t new_size)
582582
/* get pointer offsets for tweaking below */
583583
old_bottom_offset = (((duk_uint8_t *) thr->valstack_bottom) - ((duk_uint8_t *) thr->valstack));
584584
old_top_offset = (((duk_uint8_t *) thr->valstack_top) - ((duk_uint8_t *) thr->valstack));
585-
#ifdef DUK_USE_DEBUG
585+
#if defined(DUK_USE_DEBUG)
586586
old_end_offset_pre = (((duk_uint8_t *) thr->valstack_end) - ((duk_uint8_t *) thr->valstack)); /* not very useful, used for debugging */
587587
old_valstack_pre = thr->valstack;
588588
#endif
@@ -628,7 +628,7 @@ DUK_LOCAL duk_bool_t duk__resize_valstack(duk_context *ctx, duk_size_t new_size)
628628

629629
/* success, fixup pointers */
630630
old_end_offset_post = (((duk_uint8_t *) thr->valstack_end) - ((duk_uint8_t *) thr->valstack)); /* must be computed after realloc */
631-
#ifdef DUK_USE_DEBUG
631+
#if defined(DUK_USE_DEBUG)
632632
old_valstack_post = thr->valstack;
633633
#endif
634634
thr->valstack = new_valstack;
@@ -644,7 +644,7 @@ DUK_LOCAL duk_bool_t duk__resize_valstack(duk_context *ctx, duk_size_t new_size)
644644
DUK_ASSERT(thr->valstack_end >= thr->valstack_top);
645645

646646
/* useful for debugging */
647-
#ifdef DUK_USE_DEBUG
647+
#if defined(DUK_USE_DEBUG)
648648
if (old_end_offset_pre != old_end_offset_post) {
649649
DUK_D(DUK_DPRINT("valstack was resized during valstack_resize(), probably by mark-and-sweep; "
650650
"end offset changed: %lu -> %lu",
@@ -1043,7 +1043,7 @@ DUK_EXTERNAL void duk_remove(duk_context *ctx, duk_idx_t idx) {
10431043
duk_hthread *thr = (duk_hthread *) ctx;
10441044
duk_tval *p;
10451045
duk_tval *q;
1046-
#ifdef DUK_USE_REFERENCE_COUNTING
1046+
#if defined(DUK_USE_REFERENCE_COUNTING)
10471047
duk_tval tv_tmp;
10481048
#endif
10491049
duk_size_t nbytes;
@@ -1063,7 +1063,7 @@ DUK_EXTERNAL void duk_remove(duk_context *ctx, duk_idx_t idx) {
10631063
* => [ ... | x | x | q ] [ ... ]
10641064
*/
10651065

1066-
#ifdef DUK_USE_REFERENCE_COUNTING
1066+
#if defined(DUK_USE_REFERENCE_COUNTING)
10671067
/* use a temp: decref only when valstack reachable values are correct */
10681068
DUK_TVAL_SET_TVAL(&tv_tmp, p);
10691069
#endif
@@ -1074,7 +1074,7 @@ DUK_EXTERNAL void duk_remove(duk_context *ctx, duk_idx_t idx) {
10741074
DUK_TVAL_SET_UNDEFINED(q);
10751075
thr->valstack_top--;
10761076

1077-
#ifdef DUK_USE_REFERENCE_COUNTING
1077+
#if defined(DUK_USE_REFERENCE_COUNTING)
10781078
DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
10791079
#endif
10801080
}
@@ -4220,7 +4220,7 @@ DUK_EXTERNAL void duk_push_buffer_object(duk_context *ctx, duk_idx_t idx_buffer,
42204220
DUK_EXTERNAL duk_idx_t duk_push_error_object_va_raw(duk_context *ctx, duk_errcode_t err_code, const char *filename, duk_int_t line, const char *fmt, va_list ap) {
42214221
duk_hthread *thr = (duk_hthread *) ctx;
42224222
duk_hobject *proto;
4223-
#ifdef DUK_USE_AUGMENT_ERROR_CREATE
4223+
#if defined(DUK_USE_AUGMENT_ERROR_CREATE)
42244224
duk_bool_t noblame_fileline;
42254225
#endif
42264226

@@ -4230,7 +4230,7 @@ DUK_EXTERNAL duk_idx_t duk_push_error_object_va_raw(duk_context *ctx, duk_errcod
42304230
DUK_UNREF(line);
42314231

42324232
/* Error code also packs a tracedata related flag. */
4233-
#ifdef DUK_USE_AUGMENT_ERROR_CREATE
4233+
#if defined(DUK_USE_AUGMENT_ERROR_CREATE)
42344234
noblame_fileline = err_code & DUK_ERRCODE_FLAG_NOBLAME_FILELINE;
42354235
#endif
42364236
err_code = err_code & (~DUK_ERRCODE_FLAG_NOBLAME_FILELINE);
@@ -4260,7 +4260,7 @@ DUK_EXTERNAL duk_idx_t duk_push_error_object_va_raw(duk_context *ctx, duk_errcod
42604260
/* XXX: .code = err_code disabled, not sure if useful */
42614261

42624262
/* Creation time error augmentation */
4263-
#ifdef DUK_USE_AUGMENT_ERROR_CREATE
4263+
#if defined(DUK_USE_AUGMENT_ERROR_CREATE)
42644264
/* filename may be NULL in which case file/line is not recorded */
42654265
duk_err_augment_error_create(thr, thr, filename, line, noblame_fileline); /* may throw an error */
42664266
#endif
@@ -4512,7 +4512,7 @@ DUK_EXTERNAL void duk_pop(duk_context *ctx) {
45124512

45134513
tv = --thr->valstack_top; /* tv points to element just below prev top */
45144514
DUK_ASSERT(tv >= thr->valstack_bottom);
4515-
#ifdef DUK_USE_REFERENCE_COUNTING
4515+
#if defined(DUK_USE_REFERENCE_COUNTING)
45164516
DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv); /* side effects */
45174517
#else
45184518
DUK_TVAL_SET_UNDEFINED(tv);
@@ -4540,7 +4540,7 @@ DUK_INTERNAL void duk_pop_unsafe(duk_context *ctx) {
45404540

45414541
tv = --thr->valstack_top; /* tv points to element just below prev top */
45424542
DUK_ASSERT(tv >= thr->valstack_bottom);
4543-
#ifdef DUK_USE_REFERENCE_COUNTING
4543+
#if defined(DUK_USE_REFERENCE_COUNTING)
45444544
DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv); /* side effects */
45454545
#else
45464546
DUK_TVAL_SET_UNDEFINED(tv);

‎src-input/duk_bi_array.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -940,11 +940,11 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_splice(duk_context *ctx) {
940940
}
941941
DUK_ASSERT(act_start >= 0 && act_start <= (duk_int_t) len);
942942

943-
#ifdef DUK_USE_NONSTD_ARRAY_SPLICE_DELCOUNT
943+
#if defined(DUK_USE_NONSTD_ARRAY_SPLICE_DELCOUNT)
944944
if (have_delcount) {
945945
#endif
946946
del_count = duk_to_int_clamped(ctx, 1, 0, len - act_start);
947-
#ifdef DUK_USE_NONSTD_ARRAY_SPLICE_DELCOUNT
947+
#if defined(DUK_USE_NONSTD_ARRAY_SPLICE_DELCOUNT)
948948
} else {
949949
/* E5.1 standard behavior when deleteCount is not given would be
950950
* to treat it just like if 'undefined' was given, which coerces

‎src-input/duk_bi_date_unix.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ DUK_INTERNAL duk_int_t duk_bi_date_get_local_tzoffset_gmtime(duk_double_t d) {
5151
duk_int_t parts[DUK_DATE_IDX_NUM_PARTS];
5252
duk_double_t dparts[DUK_DATE_IDX_NUM_PARTS];
5353
struct tm tms[2];
54-
#ifdef DUK_USE_DATE_TZO_GMTIME
54+
#if defined(DUK_USE_DATE_TZO_GMTIME)
5555
struct tm *tm_ptr;
5656
#endif
5757

‎src-input/duk_bi_date_windows.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ DUK_LOCAL void duk__set_systime_jan1970(SYSTEMTIME *st) {
3535
}
3636
#endif /* defined(DUK_USE_DATE_NOW_WINDOWS) || defined(DUK_USE_DATE_TZO_WINDOWS) */
3737

38-
#ifdef DUK_USE_DATE_NOW_WINDOWS
38+
#if defined(DUK_USE_DATE_NOW_WINDOWS)
3939
DUK_INTERNAL duk_double_t duk_bi_date_get_now_windows(duk_context *ctx) {
4040
/* Suggested step-by-step method from documentation of RtlTimeToSecondsSince1970:
4141
* http://msdn.microsoft.com/en-us/library/windows/desktop/ms724928(v=vs.85).aspx

‎src-input/duk_bi_error.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ DUK_INTERNAL duk_ret_t duk_bi_error_constructor_shared(duk_context *ctx) {
3636
* are not desirable in this case.
3737
*/
3838

39-
#ifdef DUK_USE_AUGMENT_ERROR_CREATE
39+
#if defined(DUK_USE_AUGMENT_ERROR_CREATE)
4040
if (!duk_is_constructor_call(ctx)) {
4141
duk_err_augment_error_create(thr, thr, NULL, 0, 1 /*noblame_fileline*/);
4242
}

‎src-input/duk_bi_json.c‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030

3131
DUK_LOCAL_DECL void duk__dec_syntax_error(duk_json_dec_ctx *js_ctx);
3232
DUK_LOCAL_DECL void duk__dec_eat_white(duk_json_dec_ctx *js_ctx);
33-
#ifdef DUK_USE_JX
33+
#if defined(DUK_USE_JX)
3434
DUK_LOCAL_DECL duk_uint8_t duk__dec_peek(duk_json_dec_ctx *js_ctx);
3535
#endif
3636
DUK_LOCAL_DECL duk_uint8_t duk__dec_get(duk_json_dec_ctx *js_ctx);
3737
DUK_LOCAL_DECL duk_uint8_t duk__dec_get_nonwhite(duk_json_dec_ctx *js_ctx);
3838
DUK_LOCAL_DECL duk_uint_fast32_t duk__dec_decode_hex_escape(duk_json_dec_ctx *js_ctx, duk_small_uint_t n);
3939
DUK_LOCAL_DECL void duk__dec_req_stridx(duk_json_dec_ctx *js_ctx, duk_small_uint_t stridx);
4040
DUK_LOCAL_DECL void duk__dec_string(duk_json_dec_ctx *js_ctx);
41-
#ifdef DUK_USE_JX
41+
#if defined(DUK_USE_JX)
4242
DUK_LOCAL_DECL void duk__dec_plain_string(duk_json_dec_ctx *js_ctx);
4343
DUK_LOCAL_DECL void duk__dec_pointer(duk_json_dec_ctx *js_ctx);
4444
DUK_LOCAL_DECL void duk__dec_buffer(duk_json_dec_ctx *js_ctx);
@@ -243,7 +243,7 @@ DUK_LOCAL void duk__dec_eat_white(duk_json_dec_ctx *js_ctx) {
243243
js_ctx->p = p;
244244
}
245245

246-
#ifdef DUK_USE_JX
246+
#if defined(DUK_USE_JX)
247247
DUK_LOCAL duk_uint8_t duk__dec_peek(duk_json_dec_ctx *js_ctx) {
248248
DUK_ASSERT(js_ctx->p <= js_ctx->p_end);
249249
return *js_ctx->p;
@@ -352,7 +352,7 @@ DUK_LOCAL duk_small_int_t duk__dec_string_escape(duk_json_dec_ctx *js_ctx, duk_u
352352
cp = duk__dec_decode_hex_escape(js_ctx, 4);
353353
break;
354354
}
355-
#ifdef DUK_USE_JX
355+
#if defined(DUK_USE_JX)
356356
case DUK_ASC_UC_U: {
357357
if (js_ctx->flag_ext_custom) {
358358
cp = duk__dec_decode_hex_escape(js_ctx, 8);
@@ -486,7 +486,7 @@ DUK_LOCAL void duk__dec_string(duk_json_dec_ctx *js_ctx) {
486486
DUK_UNREACHABLE();
487487
}
488488

489-
#ifdef DUK_USE_JX
489+
#if defined(DUK_USE_JX)
490490
/* Decode a plain string consisting entirely of identifier characters.
491491
* Used to parse plain keys (e.g. "foo: 123").
492492
*/
@@ -532,7 +532,7 @@ DUK_LOCAL void duk__dec_plain_string(duk_json_dec_ctx *js_ctx) {
532532
}
533533
#endif /* DUK_USE_JX */
534534

535-
#ifdef DUK_USE_JX
535+
#if defined(DUK_USE_JX)
536536
DUK_LOCAL void duk__dec_pointer(duk_json_dec_ctx *js_ctx) {
537537
duk_hthread *thr = js_ctx->thr;
538538
duk_context *ctx = (duk_context *) thr;
@@ -586,7 +586,7 @@ DUK_LOCAL void duk__dec_pointer(duk_json_dec_ctx *js_ctx) {
586586
}
587587
#endif /* DUK_USE_JX */
588588

589-
#ifdef DUK_USE_JX
589+
#if defined(DUK_USE_JX)
590590
DUK_LOCAL void duk__dec_buffer(duk_json_dec_ctx *js_ctx) {
591591
duk_hthread *thr = js_ctx->thr;
592592
duk_context *ctx = (duk_context *) thr;
@@ -776,7 +776,7 @@ DUK_LOCAL void duk__dec_object(duk_json_dec_ctx *js_ctx) {
776776

777777
if (x == DUK_ASC_DOUBLEQUOTE) {
778778
duk__dec_string(js_ctx);
779-
#ifdef DUK_USE_JX
779+
#if defined(DUK_USE_JX)
780780
} else if (js_ctx->flag_ext_custom &&
781781
duk_unicode_is_identifier_start((duk_codepoint_t) x)) {
782782
duk__dec_plain_string(js_ctx);
@@ -897,7 +897,7 @@ DUK_LOCAL void duk__dec_value(duk_json_dec_ctx *js_ctx) {
897897
if (x == DUK_ASC_DOUBLEQUOTE) {
898898
duk__dec_string(js_ctx);
899899
} else if ((x >= DUK_ASC_0 && x <= DUK_ASC_9) || (x == DUK_ASC_MINUS)) {
900-
#ifdef DUK_USE_JX
900+
#if defined(DUK_USE_JX)
901901
if (js_ctx->flag_ext_custom && x == DUK_ASC_MINUS && duk__dec_peek(js_ctx) == DUK_ASC_UC_I) {
902902
duk__dec_req_stridx(js_ctx, DUK_STRIDX_MINUS_INFINITY); /* "-Infinity", '-' has been eaten */
903903
duk_push_number(ctx, -DUK_DOUBLE_INFINITY);
@@ -918,7 +918,7 @@ DUK_LOCAL void duk__dec_value(duk_json_dec_ctx *js_ctx) {
918918
} else if (x == DUK_ASC_LC_N) {
919919
duk__dec_req_stridx(js_ctx, DUK_STRIDX_LC_NULL);
920920
duk_push_null(ctx);
921-
#ifdef DUK_USE_JX
921+
#if defined(DUK_USE_JX)
922922
} else if (js_ctx->flag_ext_custom && x == DUK_ASC_LC_U) {
923923
duk__dec_req_stridx(js_ctx, DUK_STRIDX_LC_UNDEFINED);
924924
duk_push_undefined(ctx);
@@ -1108,7 +1108,7 @@ DUK_LOCAL duk_uint8_t *duk__emit_esc_auto_fast(duk_json_enc_ctx *js_ctx, duk_uin
11081108
* (nybble_count << 16) | (escape_char1) | (escape_char2)
11091109
*/
11101110

1111-
#ifdef DUK_USE_JX
1111+
#if defined(DUK_USE_JX)
11121112
if (DUK_LIKELY(cp < 0x100UL)) {
11131113
if (DUK_UNLIKELY(js_ctx->flag_ext_custom)) {
11141114
tmp = DUK__MKESC(2, DUK_ASC_BACKSLASH, DUK_ASC_LC_X);
@@ -1120,7 +1120,7 @@ DUK_LOCAL duk_uint8_t *duk__emit_esc_auto_fast(duk_json_enc_ctx *js_ctx, duk_uin
11201120
if (DUK_LIKELY(cp < 0x10000UL)) {
11211121
tmp = DUK__MKESC(4, DUK_ASC_BACKSLASH, DUK_ASC_LC_U);
11221122
} else {
1123-
#ifdef DUK_USE_JX
1123+
#if defined(DUK_USE_JX)
11241124
if (DUK_LIKELY(js_ctx->flag_ext_custom)) {
11251125
tmp = DUK__MKESC(8, DUK_ASC_BACKSLASH, DUK_ASC_UC_U);
11261126
} else
@@ -1314,7 +1314,7 @@ DUK_LOCAL void duk__enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_st
13141314
p = p_tmp + 1;
13151315
}
13161316

1317-
#ifdef DUK_USE_NONSTD_JSON_ESC_U2028_U2029
1317+
#if defined(DUK_USE_NONSTD_JSON_ESC_U2028_U2029)
13181318
if (js_ctx->flag_ascii_only || cp == 0x2028 || cp == 0x2029) {
13191319
#else
13201320
if (js_ctx->flag_ascii_only) {
@@ -1520,8 +1520,8 @@ DUK_LOCAL void duk__enc_buffer_data(duk_json_enc_ctx *js_ctx, duk_uint8_t *buf_d
15201520
* variants is to be as useful to a programmer as possible.
15211521
*/
15221522

1523-
/* The #ifdef clutter here needs to handle the three cases:
1524-
* (1) JX+JC, (2) JX only, (3) JC only.
1523+
/* The #if defined() clutter here needs to handle the three
1524+
* cases: (1) JX+JC, (2) JX only, (3) JC only.
15251525
*/
15261526

15271527
/* Note: space must cater for both JX and JC. */
@@ -1575,8 +1575,8 @@ DUK_LOCAL void duk__enc_pointer(duk_json_enc_ctx *js_ctx, void *ptr) {
15751575

15761576
DUK_MEMZERO(buf, sizeof(buf));
15771577

1578-
/* The #ifdef clutter here needs to handle the three cases:
1579-
* (1) JX+JC, (2) JX only, (3) JC only.
1578+
/* The #if defined() clutter here needs to handle the three
1579+
* cases: (1) JX+JC, (2) JX only, (3) JC only.
15801580
*/
15811581
#if defined(DUK_USE_JX) && defined(DUK_USE_JC)
15821582
if (js_ctx->flag_ext_custom)
@@ -2721,7 +2721,7 @@ void duk_bi_json_parse_helper(duk_context *ctx,
27212721
duk_json_dec_ctx js_ctx_alloc;
27222722
duk_json_dec_ctx *js_ctx = &js_ctx_alloc;
27232723
duk_hstring *h_text;
2724-
#ifdef DUK_USE_ASSERTIONS
2724+
#if defined(DUK_USE_ASSERTIONS)
27252725
duk_idx_t entry_top = duk_get_top(ctx);
27262726
#endif
27272727

@@ -2737,7 +2737,7 @@ void duk_bi_json_parse_helper(duk_context *ctx,
27372737

27382738
DUK_MEMZERO(&js_ctx_alloc, sizeof(js_ctx_alloc));
27392739
js_ctx->thr = thr;
2740-
#ifdef DUK_USE_EXPLICIT_NULL_INIT
2740+
#if defined(DUK_USE_EXPLICIT_NULL_INIT)
27412741
/* nothing now */
27422742
#endif
27432743
js_ctx->recursion_limit = DUK_USE_JSON_DEC_RECLIMIT;
@@ -2848,7 +2848,7 @@ void duk_bi_json_stringify_helper(duk_context *ctx,
28482848

28492849
DUK_MEMZERO(&js_ctx_alloc, sizeof(js_ctx_alloc));
28502850
js_ctx->thr = thr;
2851-
#ifdef DUK_USE_EXPLICIT_NULL_INIT
2851+
#if defined(DUK_USE_EXPLICIT_NULL_INIT)
28522852
js_ctx->h_replacer = NULL;
28532853
js_ctx->h_gap = NULL;
28542854
#endif
@@ -2861,17 +2861,17 @@ void duk_bi_json_stringify_helper(duk_context *ctx,
28612861
js_ctx->flags = flags;
28622862
js_ctx->flag_ascii_only = flags & DUK_JSON_FLAG_ASCII_ONLY;
28632863
js_ctx->flag_avoid_key_quotes = flags & DUK_JSON_FLAG_AVOID_KEY_QUOTES;
2864-
#ifdef DUK_USE_JX
2864+
#if defined(DUK_USE_JX)
28652865
js_ctx->flag_ext_custom = flags & DUK_JSON_FLAG_EXT_CUSTOM;
28662866
#endif
2867-
#ifdef DUK_USE_JC
2867+
#if defined(DUK_USE_JC)
28682868
js_ctx->flag_ext_compatible = flags & DUK_JSON_FLAG_EXT_COMPATIBLE;
28692869
#endif
28702870
#if defined(DUK_USE_JX) || defined(DUK_USE_JC)
28712871
js_ctx->flag_ext_custom_or_compatible = flags & (DUK_JSON_FLAG_EXT_CUSTOM | DUK_JSON_FLAG_EXT_COMPATIBLE);
28722872
#endif
28732873

2874-
/* The #ifdef clutter here handles the JX/JC enable/disable
2874+
/* The #if defined() clutter here handles the JX/JC enable/disable
28752875
* combinations properly.
28762876
*/
28772877
#if defined(DUK_USE_JX) || defined(DUK_USE_JC)

‎src-input/duk_bi_protos.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* header declarations emitted by genbuiltins.py.
44
*/
55

6-
#ifndef DUK_BUILTIN_PROTOS_H_INCLUDED
6+
#if !defined(DUK_BUILTIN_PROTOS_H_INCLUDED)
77
#define DUK_BUILTIN_PROTOS_H_INCLUDED
88

99
/* Buffer size needed for ISO 8601 formatting.

0 commit comments

Comments
 (0)