Reworked the undef stuff a little

[wxWidgets.git] / include / wx / expr.h

diff --git a/include/wx/expr.h b/include/wx/expr.h
index d19d8580b1724227577c3c9a76f943c5e5887ff7..7dee180b93cd77375c72b4ec64acb124665e5004 100644 (file)
--- a/include/wx/expr.h
+++ b/include/wx/expr.h
@@ -1,4 +1,4 @@
-/////////////////////////////////////////////////////////////////////////////
+/* //////////////////////////////////////////////////////////////////////////

 // Name:        expr.h
 // Purpose:     C helper defines and functions for wxExpr class
 // Author:      Julian Smart
 // Name:        expr.h
 // Purpose:     C helper defines and functions for wxExpr class
 // Author:      Julian Smart


@@ -7,10 +7,10 @@
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Licence:    wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Licence:    wxWindows licence

-/////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////// */

 
 

-#ifndef __EXPRH__
-#define __EXPRH__
+#ifndef _WX_EXPRH__
+#define _WX_EXPRH__

 
 #include <math.h>
 #include <stdlib.h>
 
 #include <math.h>
 #include <stdlib.h>


@@ -88,12 +88,12 @@
 #ifdef __cplusplus
 extern "C" {
 char *proio_cons(char *, char *);
 #ifdef __cplusplus
 extern "C" {
 char *proio_cons(char *, char *);

-char * make_integer(char *);
-char * make_word(char *);
-char * make_string(char *);
-char * make_real(char *, char *);
-char * make_exp(char *, char *);
-char * make_exp2(char *, char *, char*);
+char * wxmake_integer(char *);
+char * wxmake_word(char *);
+char * wxmake_string(char *);
+char * wxmake_real(char *, char *);
+char * wxmake_exp(char *, char *);
+char * wxmake_exp2(char *, char *, char*);

 void add_expr(char *);
 void process_command(char *);
 void syntax_error(char *);
 void add_expr(char *);
 void process_command(char *);
 void syntax_error(char *);


@@ -101,23 +101,23 @@ void syntax_error(char *);
 #else
 #if __BORLANDC__
 char *proio_cons(char *, char *);
 #else
 #if __BORLANDC__
 char *proio_cons(char *, char *);

-char * make_integer(char *);
-char * make_word(char *);
-char * make_string(char *);
-char * make_real(char *, char *);
-char * make_exp(char *, char *);
-char * make_exp2(char *, char *, char*);
+char * wxmake_integer(char *);
+char * wxmake_word(char *);
+char * wxmake_string(char *);
+char * wxmake_real(char *, char *);
+char * wxmake_exp(char *, char *);
+char * wxmake_exp2(char *, char *, char*);

 void add_expr(char *);
 void process_command(char *);
 void syntax_error(char *);
 #else
 char *proio_cons();
 void add_expr(char *);
 void process_command(char *);
 void syntax_error(char *);
 #else
 char *proio_cons();

-char * make_integer();
-char * make_word();
-char * make_string();
-char * make_real();
-char * make_exp();
-char * make_exp2();
+char * wxmake_integer();
+char * wxmake_word();
+char * wxmake_string();
+char * wxmake_real();
+char * wxmake_exp();
+char * wxmake_exp2();

 
 void add_expr();
 void process_command();
 
 void add_expr();
 void process_command();


@@ -126,4 +126,4 @@ void syntax_error();
 #endif
 
 #endif
 #endif
 
 #endif

-       // __EXPRH__
+       /* _WX_EXPRH__ */