Make #include callbacks optional.

Now fails at runtime if we hit an #include without callbacks defined. If we never need the callbacks, it's silly to assert they must exist. --HG-- branch : calculator-experiment
icculus · Feb 8, 2010 · 699bb51 · 699bb51
1 parent e7818ac
commit 699bb51
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/mojoshader_preprocessor.c b/mojoshader_preprocessor.c
@@ -656,8 +656,6 @@ Preprocessor *preprocessor_start(const char *fname, const char *source,
     // the preprocessor is internal-only, so we verify all these are != NULL.
     assert(m != NULL);
     assert(f != NULL);
-    assert(open_callback != NULL);
-    assert(close_callback != NULL);
 
     Context *ctx = (Context *) m(sizeof (Context), d);
     if (ctx == NULL)
@@ -837,6 +835,12 @@ static void handle_pp_include(Context *ctx)
 
     const char *newdata = NULL;
     unsigned int newbytes = 0;
+    if ((ctx->open_callback == NULL) || (ctx->close_callback == NULL))
+    {
+        fail(ctx, "Saw #include, but no include callbacks defined");
+        return;
+    } // if
+
     if (!ctx->open_callback(incltype, filename, state->source_base,
                             &newdata, &newbytes, ctx->malloc,
                             ctx->free, ctx->malloc_data))