Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / lyx_gui.C

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 0880fdd93cb73bf9d6581d3956ef9ab63d7b916c..8964860e0b1142da61a3bd602a4bd6d77822f8b1 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -19,7 +19,6 @@
 #include "lyx_gui.h"
 #include FORMS_H_LOCATION
 #include "support/filetools.h"
-#include "combox.h"
 #include "lyx.h"
 #include "form1.h"
 #include "print_form.h"
@@ -58,11 +57,15 @@ FL_CMD_OPT cmdopt[] =
        {"-geometry", "*.geometry", XrmoptionSepArg, "690x510"}
 };
 
-static int width  = 690;
-static int height = 510;
-static int xpos   = -1;
-static int ypos   = -1;
-static char geometry[40];
+namespace {
+
+int width  = 690;
+int height = 510;
+int xpos   = -1;
+int ypos   = -1;
+char geometry[40];
+
+} // namespace anon
 
 
 FL_resource res[] =