Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/xlincity-01-solaris.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 840 5cbc36d8fdab
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
840
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
     1
 
diff -urN ../lincity-1.12.0/lcconfig.h ./lcconfig.h
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
     2
 
--- ../lincity-1.12.0/lcconfig.h	2003-12-19 03:17:50.000000000 +0000
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
     3
 
+++ ./lcconfig.h	2007-11-17 07:21:54.000000000 +0000
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
     4
 
@@ -19,7 +19,6 @@
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
     5
 
 #elif (SIZEOF_LONG==4)
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
     6
 
 typedef long Int32;
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
     7
 
 #else
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
     8
 
-ERROR.  Int32 is not defined.
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
     9
 
 #endif
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    10
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    11
 
 #if (SIZEOF_SHORT==2)
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    12
 
@@ -27,7 +26,6 @@
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    13
 
 #elif (SIZEOF_INT==2)
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    14
 
 typedef int Int16;
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    15
 
 #else
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    16
 
-ERROR.  Int16 is not defined.
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    17
 
 #endif
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    18
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    19
 
 #endif	/* __lcconfig_h__ */
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    20
 
diff -urN ../lincity-1.12.0/mouse.c ./mouse.c
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    21
 
--- ../lincity-1.12.0/mouse.c	2003-12-19 03:17:50.000000000 +0000
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    22
 
+++ ./mouse.c	2007-11-17 07:19:50.000000000 +0000
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    23
 
@@ -1056,7 +1056,7 @@
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    24
 
    and set to 1 if the existing transport if the more expensive sort
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    25
 
    (e.g. GROUP_RAIL when overwriting GROUP_ROAD).
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    26
 
 */
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    27
 
-inline int
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    28
 
+int
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    29
 
 mt_erase(int x, int y)
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    30
 
 {
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    31
 
     if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    32
 
@@ -1093,7 +1093,7 @@
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    33
 
     return 0;
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    34
 
 }
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    35
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    36
 
-inline int
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    37
 
+int
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    38
 
 mt_temp(int x, int y)
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    39
 
 {
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    40
 
     if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    41
 
@@ -1127,7 +1127,7 @@
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    42
 
     return 0;
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    43
 
 }
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    44
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    45
 
-inline int
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    46
 
+int
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    47
 
 mt_perm(int x, int y)
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    48
 
 {
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    49
 
     /* By now, it has already been mt_erase()'d */
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    50
 
diff -urN ../lincity-1.12.0/pixmap.c ./pixmap.c
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    51
 
--- ../lincity-1.12.0/pixmap.c	2003-12-19 03:17:50.000000000 +0000
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    52
 
+++ ./pixmap.c	2007-11-17 07:23:22.000000000 +0000
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    53
 
@@ -390,7 +390,7 @@
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    54
 
 		  likes it in the file.  Still need to fix this in autoconf,
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    55
 
                   but for now this will do. */
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    56
 
 #if !defined (WIN32)
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    57
 
-inline int
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    58
 
+int
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    59
 
 pixmap_index (int x, int y)
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    60
 
 {
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    61
 
     return y*pixmap_width + x;
5cbc36d8fdab Checked in first OpenSolaris version of xlincity. xlincity is another fork
bnitz
parents:
diff changeset 
    62
 
Binary files ../lincity-1.12.0/xlincity and ./xlincity differ
upstream/spec-files-extra