# HG changeset patch # User Teemu Piippo # Date 1389992260 -7200 # Node ID 2ed3430fdd086a8fedc080963d4250dfe6ea67b2 # Parent 2425fa6a4f2166ade6a4486914a4bb543490e690 - forgot to rename these header guards when i ported the lexer from an earlier project of mine diff -r 2425fa6a4f21 -r 2ed3430fdd08 src/lexer.h --- a/src/lexer.h Fri Jan 17 22:55:13 2014 +0200 +++ b/src/lexer.h Fri Jan 17 22:57:40 2014 +0200 @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef LEXER_H -#define LEXER_H +#ifndef BOTC_LEXER_H +#define BOTC_LEXER_H #include "main.h" #include "lexer_scanner.h" @@ -112,4 +112,4 @@ static string describe_token_private (e_token tok_type, token* tok); }; -#endif // LEXER_H +#endif // BOTC_LEXER_H diff -r 2425fa6a4f21 -r 2ed3430fdd08 src/lexer_scanner.h --- a/src/lexer_scanner.h Fri Jan 17 22:55:13 2014 +0200 +++ b/src/lexer_scanner.h Fri Jan 17 22:57:40 2014 +0200 @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef IRIS_SCANNER_H -#define IRIS_SCANNER_H +#ifndef BOTC_LEXER_SCANNER_H +#define BOTC_LEXER_SCANNER_H #include #include "main.h" @@ -89,9 +89,9 @@ static string get_token_string (e_token a); private: - char* m_data, - * m_ptr, - * m_line_break_pos; + char* m_data; + char* m_ptr; + char* m_line_break_pos; string m_token_text, m_last_token; e_token m_token_type; @@ -112,5 +112,4 @@ void skip (int chars); }; -#endif // IRIS_SCANNER_H - +#endif // BOTC_LEXER_SCANNER_H