make-definitions-private.diff

diff --git a/ext/extconf.rb b/ext/extconf.rb
index 1bbfe49..eed4a7a 100644
--- a/ext/extconf.rb
+++ b/ext/extconf.rb
@@ -16,8 +16,8 @@ DWORD = sized_int(4, ["unsigned long", "unsigned int"])
 WORD =  sized_int(2, ["unsigned int", "unsigned short"])
 BYTE = "unsigned char"
 
-$defs.push("-DDWORD='#{DWORD}'")
-$defs.push("-DWORD='#{WORD}'")
-$defs.push("-DBYTE='#{BYTE}'")
+$defs.push("-DMKD_DWORD='#{DWORD}'")
+$defs.push("-DMKD_WORD='#{WORD}'")
+$defs.push("-DMKD_BYTE='#{BYTE}'")
 
 create_makefile('rdiscount')
diff --git a/ext/flags.c b/ext/flags.c
index 4021a8b..aa0e94c 100644
--- a/ext/flags.c
+++ b/ext/flags.c
@@ -2,7 +2,7 @@
 #include "markdown.h"
 
 struct flagnames {
-    DWORD flag;
+    MKD_DWORD flag;
     char *name;
 };
 
@@ -33,7 +33,7 @@ static struct flagnames flagnames[] = {
 
 
 void
-mkd_flags_are(FILE *f, DWORD flags, int htmlplease)
+mkd_flags_are(FILE *f, MKD_DWORD flags, int htmlplease)
 {
     int i;
     int not, set, even=1;
diff --git a/ext/markdown.c b/ext/markdown.c
index 815303c..0903168 100644
--- a/ext/markdown.c
+++ b/ext/markdown.c
@@ -485,7 +485,7 @@ isdefinition(Line *t, int *clip, int *kind)
 
 
 static int
-islist(Line *t, int *clip, DWORD flags, int *list_type)
+islist(Line *t, int *clip, MKD_DWORD flags, int *list_type)
 {
     int i, j;
     char *q;
@@ -616,7 +616,7 @@ centered(Line *first, Line *last)
 
 
 static int
-endoftextblock(Line *t, int toplevelblock, DWORD flags)
+endoftextblock(Line *t, int toplevelblock, MKD_DWORD flags)
 {
     int z;
 
@@ -637,7 +637,7 @@ endoftextblock(Line *t, int toplevelblock, DWORD flags)
 
 
 static Line *
-textblock(Paragraph *p, int toplevel, DWORD flags)
+textblock(Paragraph *p, int toplevel, MKD_DWORD flags)
 {
     Line *t, *next;
 
@@ -672,7 +672,7 @@ szmarkerclass(char *p)
 #define iscsschar(c) (isalpha(c) || (c == '-') || (c == '_') )
 
 static int
-isdivmarker(Line *p, int start, DWORD flags)
+isdivmarker(Line *p, int start, MKD_DWORD flags)
 {
     char *s;
     int last, i;
@@ -710,7 +710,7 @@ isdivmarker(Line *p, int start, DWORD flags)
  * way the markdown sample web form at Daring Fireball works.
  */
 static Line *
-quoteblock(Paragraph *p, DWORD flags)
+quoteblock(Paragraph *p, MKD_DWORD flags)
 {
     Line *t, *q;
     int qp;
@@ -792,7 +792,7 @@ typedef int (*linefn)(Line *);
  * marker, but multiple paragraphs need to start with a 4-space indent.
  */
 static Line *
-listitem(Paragraph *p, int indent, DWORD flags, linefn check)
+listitem(Paragraph *p, int indent, MKD_DWORD flags, linefn check)
 {
     Line *t, *q;
     int clip = indent;
@@ -1198,7 +1198,7 @@ compile(Line *ptr, int toplevel, MMIOT *f)
  * prepare and compile `text`, returning a Paragraph tree.
  */
 int
-mkd_compile(Document *doc, DWORD flags)
+mkd_compile(Document *doc, MKD_DWORD flags)
 {
     if ( !doc )
   return 0;
diff --git a/ext/markdown.h b/ext/markdown.h
index c29253a..51c971c 100644
--- a/ext/markdown.h
+++ b/ext/markdown.h
@@ -82,7 +82,7 @@ typedef struct mmiot {
     int reference;
     char *ref_prefix;
     STRING(Footnote) *footnotes;
-    DWORD flags;
+    MKD_DWORD flags;
 #define MKD_NOLINKS	0x00000001
 #define MKD_NOIMAGE	0x00000002
 #define MKD_NOPANTS	0x00000004
@@ -138,7 +138,7 @@ typedef struct document {
 
 
 extern int  mkd_firstnonblank(Line *);
-extern int  mkd_compile(Document *, DWORD);
+extern int  mkd_compile(Document *, MKD_DWORD);
 extern int  mkd_document(Document *, char **);
 extern int  mkd_generatehtml(Document *, FILE *);
 extern int  mkd_css(Document *, char **);
@@ -147,16 +147,16 @@ extern int  mkd_generatecss(Document *, FILE *);
 extern int  mkd_xml(char *, int , char **);
 extern int  mkd_generatexml(char *, int, FILE *);
 extern void mkd_cleanup(Document *);
-extern int  mkd_line(char *, int, char **, DWORD);
-extern int  mkd_generateline(char *, int, FILE*, DWORD);
+extern int  mkd_line(char *, int, char **, MKD_DWORD);
+extern int  mkd_generateline(char *, int, FILE*, MKD_DWORD);
 #define mkd_text mkd_generateline
 extern void mkd_basename(Document*, char *);
 
 typedef int (*mkd_sta_function_t)(const int,const void*);
 extern void mkd_string_to_anchor(char*,int, mkd_sta_function_t, void*, int);
 
-extern Document *mkd_in(FILE *, DWORD);
-extern Document *mkd_string(char*,int, DWORD);
+extern Document *mkd_in(FILE *, MKD_DWORD);
+extern Document *mkd_string(char*,int, MKD_DWORD);
 
 extern void mkd_initialize();
 extern void mkd_shlib_destructor();
diff --git a/ext/mkdio.c b/ext/mkdio.c
index 5cead41..203d1a7 100644
--- a/ext/mkdio.c
+++ b/ext/mkdio.c
@@ -139,7 +139,7 @@ populate(getc_func getc, void* ctx, int flags)
 /* convert a file into a linked list
  */
 Document *
-mkd_in(FILE *f, DWORD flags)
+mkd_in(FILE *f, MKD_DWORD flags)
 {
     return populate((getc_func)fgetc, f, flags & INPUT_MASK);
 }
@@ -167,7 +167,7 @@ strget(struct string_ctx *in)
 /* convert a block of text into a linked list
  */
 Document *
-mkd_string(char *buf, int len, DWORD flags)
+mkd_string(char *buf, int len, MKD_DWORD flags)
 {
     struct string_ctx about;
 
@@ -259,7 +259,7 @@ mkd_parse_line(char *bfr, int size, MMIOT *f, int flags)
 /* ___mkd_reparse() a line, returning it in malloc()ed memory
  */
 int
-mkd_line(char *bfr, int size, char **res, DWORD flags)
+mkd_line(char *bfr, int size, char **res, MKD_DWORD flags)
 {
     MMIOT f;
     int len;
@@ -289,7 +289,7 @@ mkd_line(char *bfr, int size, char **res, DWORD flags)
 /* ___mkd_reparse() a line, writing it to a FILE
  */
 int
-mkd_generateline(char *bfr, int size, FILE *output, DWORD flags)
+mkd_generateline(char *bfr, int size, FILE *output, MKD_DWORD flags)
 {
     MMIOT f;