Buffer.cpp: compile fix

scons_manifest.py: dito

André, please check if you can compile before you commit

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20721 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index ae5c787b9d9b933a1bd152ff0cb47719815f0b7a..e3e41264fce8aad095471c84be5245bc66445f70 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -121,7 +121,6 @@ src_header_files = Split('''
     Variables.h
     WordLangTuple.h
     buffer_funcs.h
-    callback.h
     debug.h
     factory.h
     gettext.h
@@ -223,7 +222,6 @@ src_pre_files = Split('''
     VSpace.cpp
     boost.cpp
     buffer_funcs.cpp
-    callback.cpp
     debug.cpp
     factory.cpp
     gettext.cpp
@@ -683,6 +681,7 @@ src_frontends_header_files = Split('''
     FontLoader.h
     FontMetrics.h
     Gui.h
+    KeyModifier.h
     KeySymbol.h
     LyXView.h
     NoGuiFontLoader.h
@@ -692,7 +691,6 @@ src_frontends_header_files = Split('''
     WorkArea.h
     WorkAreaManager.h
     alert.h
-    key_state.h
     mouse_state.h
 ''')
 

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 5218e84639a0f57521d3063c38881faa6a6d7761..5903009e35b13d02cd3921dc08ff6c3f2093002a 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -88,6 +88,10 @@
 #include "support/textutils.h"
 #include "support/convert.h"
 
+#if !defined (HAVE_FORK)
+# define fork() -1
+#endif
+
 #include <boost/bind.hpp>
 #include <boost/filesystem/exception.hpp>
 #include <boost/filesystem/operations.hpp>