Merge branch 'master' of github.com:doxygen/doxygen

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: doxygen
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

addon/doxywizard/config_doxyw.l

@@ -42,6 +42,7 @@
 
 #define MAX_INCLUDE_DEPTH 10
 
+#define USE_STATE2STRING 0
 
 /* -----------------------------------------------------------------
  *
@@ -374,6 +375,9 @@ static void readIncludeFile(const QString &incName)
   }
 }
 
+#if USE_STATE2STRING
+static const char *stateToString(int state);
+#endif
 
 %}
 
@@ -832,4 +836,6 @@ void writeStringValue(QTextStream &t,TextCodecAdapter *codec,const QString &s)
     }
   }
 }
+#if USE_STATE2STRING
 #include "config_doxyw.l.h"
+#endif

libmscgen/mscgen_lexer.l

@@ -33,6 +33,9 @@
 #include "mscgen_safe.h"
 #include "mscgen_lexer.h"
 #include "mscgen_language.h"  /* Token definitions from Yacc/Bison */
+
+#define USE_STATE2STRING 0
+
 /* Counter for error reporting */
 static unsigned long  lex_linenum = 1;
 static char          *lex_line = NULL;
@@ -42,6 +45,10 @@ static Boolean        lex_utf8 = FALSE;
 static void newline(const char *text, unsigned int n);
 static char *trimQstring(char *s);
 static const char *stateToString(int state);
+
+#if USE_STATE2STRING
+static const char *stateToString(int state);
+#endif
 %}
 
 /* Not used, so prevent compiler warning */
@@ -241,5 +248,7 @@ void lex_resetparser()
   lex_utf8 = FALSE;
 }
 
+#if USE_STATE2STRING
 #include "mscgen_lexer.l.h"
+#endif
 /* END OF FILE */