summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2011-01-13 16:52:22 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2011-01-13 16:52:22 +0000
commitc11c8e1e5f5aadb176dc12dbf243bc7774a2fd8e (patch)
tree2f3044e4e5855206b1d2b9c3f283c58c64ea1a18
parentb0a45b0d76505c4204847728e3b44492755eebf2 (diff)
Move main() from dix to ddx for Kdrive DDXmain-in-ddx
-rw-r--r--hw/kdrive/ephyr/ephyrinit.c7
-rw-r--r--hw/kdrive/fake/fakeinit.c7
-rw-r--r--hw/kdrive/fbdev/fbinit.c7
3 files changed, 21 insertions, 0 deletions
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 27cab3b63..b5390087a 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -28,6 +28,7 @@
#endif
#include "ephyr.h"
#include "ephyrlog.h"
+#include "dixmain.h"
extern Window EphyrPreExistingHostWin;
extern Bool EphyrWantGrayScale;
@@ -47,6 +48,12 @@ extern KdKeyboardDriver LinuxEvdevKeyboardDriver;
void processScreenArg (char *screen_size, char *parent_id) ;
+int
+main(int argc, char *argv[], char *envp[])
+{
+ return dix_main(argc, argv, envp);
+}
+
void
InitCard (char *name)
{
diff --git a/hw/kdrive/fake/fakeinit.c b/hw/kdrive/fake/fakeinit.c
index ba61959ef..03fb51114 100644
--- a/hw/kdrive/fake/fakeinit.c
+++ b/hw/kdrive/fake/fakeinit.c
@@ -24,6 +24,13 @@
#include <kdrive-config.h>
#endif
#include "fake.h"
+#include "dixmain.h"
+
+int
+main(int argc, char *argv[], char *envp[])
+{
+ return dix_main(argc, argv, envp);
+}
void
InitCard (char *name)
diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c
index 51e7e00d9..087068d92 100644
--- a/hw/kdrive/fbdev/fbinit.c
+++ b/hw/kdrive/fbdev/fbinit.c
@@ -24,6 +24,13 @@
#include <kdrive-config.h>
#endif
#include <fbdev.h>
+#include "dixmain.h"
+
+int
+main(int argc, char *argv[], char *envp[])
+{
+ return dix_main(argc, argv, envp);
+}
void
InitCard (char *name)