xserver: Branch 'server-1.2-branch'

[Alan Coopersmith]

 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree fde2d5e033ea7eab10b2c0aac56a9e581cbb8898 (from dd8bc0162c5c32eed83c46b00424fe08b9784e83)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Dec 1 16:42:37 2006 -0800

    Fix syntax error in configure check for SYSV_IPC that broke with Sun cc
    (cherry picked from a5d6499d666fea4a9988118ddd3a5e4c9cfcc32c commit)

diff --git a/configure.ac b/configure.ac
index 13561b2..249f58d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,7 +153,7 @@ AC_CACHE_CHECK([for SYSV IPC],
 		[AC_TRY_LINK([
 #include <sys/shm.h>
 ],[
-int main () { 
+{ 
     int id;
     id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R);
     if (id < 0) return -1;