#include "lyx_gui.h"
#include FORMS_H_LOCATION
#include "support/filetools.h"
-#include "lyx.h"
-#include "form1.h"
+#include "support/os.h"
+#include "figure_form.h"
#include "print_form.h"
#include "tex-strings.h"
#include "lyx_main.h"
{"-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[] =
Display * display = fl_get_display();
if (!display) {
lyxerr << "LyX: unable to access X display, exiting" << endl;
+ os::warn("Unable to access X display, exiting");
exit(1);
}
fcntl(ConnectionNumber(display), F_SETFD, FD_CLOEXEC);