Author: branden
Date: 2003-05-26 01:46:08 -0500 (Mon, 26 May 2003)
New Revision: 55
Modified:
trunk/patches/910_Xserver_RTFF.diff
Log:
gcc 3.3 doesn't like multiline string literals; fix them
Modified: trunk/patches/910_Xserver_RTFF.diff
==============================================================================
--- trunk/patches/910_Xserver_RTFF.diff 2003-05-26 00:31:33 UTC (rev 54)
+++ trunk/patches/910_Xserver_RTFF.diff 2003-05-26 06:46:08 UTC (rev 55)
@@ -23,39 +23,39 @@
}
if (!SetDefaultFont(defaultTextFont))
+#ifdef DEBIAN
-+ FatalError("could not open default font '%s';
-+the X server's font paths might be misconfigured, remote font server(s)
-+may be unreachable, and/or local fonts may not be installed or are not
-+configured correctly.
-+
-+People inexperienced with the X Window System should have either the
-+\"x-window-system\" or \"x-window-system-core\" packages installed.
-+# apt-get install x-window-system-core
-+# apt-get install x-window-system
-+
-+Other useful commands to run include:
-+$ dpkg --status xserver-common
-+$ dpkg --status xfonts-base
-+$ zmore /usr/share/doc/xfree86-common/FAQ.gz", defaultTextFont);
++ FatalError("could not open default font '%s';\n"
++"the X server's font paths might be misconfigured, remote font server(s)\n"
++"may be unreachable, and/or local fonts may not be installed or are not\n"
++"configured correctly.\n"
++"\n"
++"People inexperienced with the X Window System should have either the\n"
++"\"x-window-system\" or \"x-window-system-core\" packages installed.\n"
++"# apt-get install x-window-system-core\n"
++"# apt-get install x-window-system\n"
++"\n"
++"Other useful commands to run include:\n"
++"$ dpkg --status xserver-common\n"
++"$ dpkg --status xfonts-base\n"
++"$ zmore /usr/share/doc/xfree86-common/FAQ.gz", defaultTextFont);
+#else
FatalError("could not open default font '%s'", defaultTextFont);
+#endif
if (!(rootCursor = CreateRootCursor(defaultCursorFont, 0)))
+#ifdef DEBIAN
-+ FatalError("could not open default cursor font '%s';
-+the X server's font paths might be misconfigured, remote font server(s)
-+may be unreachable, and/or local fonts may not be installed or are not
-+configured correctly.
-+
-+People inexperienced with the X Window System should have either the
-+\"x-window-system\" or \"x-window-system-core\" packages installed.
-+# apt-get install x-window-system-core
-+# apt-get install x-window-system
-+
-+Useful commands to run include:
-+$ dpkg --status xserver-common
-+$ dpkg --status xfonts-base
-+$ zmore /usr/share/doc/xfree86-common/FAQ.gz", defaultCursorFont);
++ FatalError("could not open default cursor font '%s';\n"
++"the X server's font paths might be misconfigured, remote font server(s)\n"
++"may be unreachable, and/or local fonts may not be installed or are not\n"
++"configured correctly.\n"
++"\n"
++"People inexperienced with the X Window System should have either the\n"
++"\"x-window-system\" or \"x-window-system-core\" packages installed.\n"
++"# apt-get install x-window-system-core\n"
++"# apt-get install x-window-system\n"
++"\n"
++"Useful commands to run include:\n"
++"$ dpkg --status xserver-common\n"
++"$ dpkg --status xfonts-base\n"
++"$ zmore /usr/share/doc/xfree86-common/FAQ.gz", defaultCursorFont);
+#else
FatalError("could not open default cursor font '%s'",
defaultCursorFont);