1.1 --- a/src/highlighter.h Wed Aug 31 12:58:48 2016 +0200 1.2 +++ b/src/highlighter.h Wed Aug 31 14:41:56 2016 +0200 1.3 @@ -30,13 +30,7 @@ 1.4 #ifndef CODEGENS_H 1.5 #define CODEGENS_H 1.6 1.7 -#include <stdlib.h> 1.8 -#include <stdio.h> 1.9 -#include <string.h> 1.10 -#include <ctype.h> 1.11 -#include "ucx/string.h" 1.12 #include "ucx/buffer.h" 1.13 -#include "ucx/utils.h" 1.14 1.15 #ifdef __cplusplus 1.16 extern "C" { 1.17 @@ -46,16 +40,16 @@ 1.18 int multiline_comment; 1.19 UcxBuffer* primary_buffer; 1.20 UcxBuffer* secondary_buffer; 1.21 -} HighlighterData; 1.22 +} c2html_highlighter_data; 1.23 1.24 -HighlighterData* new_highlighter_data(); 1.25 -void free_highlighter_data(HighlighterData*); 1.26 +#define C2HTML_HIGHLIGHTER_SIGNATURE \ 1.27 +char*,UcxBuffer*, c2html_highlighter_data* 1.28 1.29 -typedef void(*highlighter_func)(char*,UcxBuffer*,HighlighterData*); 1.30 +typedef void(*c2html_highlighter_func)(C2HTML_HIGHLIGHTER_SIGNATURE); 1.31 1.32 -void plain_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd); 1.33 -void c_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd); 1.34 -void java_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd); 1.35 +void c2html_plain_highlighter(C2HTML_HIGHLIGHTER_SIGNATURE); 1.36 +void c2html_c_highlighter(C2HTML_HIGHLIGHTER_SIGNATURE); 1.37 +void c2html_java_highlighter(C2HTML_HIGHLIGHTER_SIGNATURE); 1.38 1.39 #ifdef __cplusplus 1.40 }