Mercurial Mercurial > sustaining > oi_151a > spec-files / 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/gnome-games-02-ggz-function.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 19089 977f5478862e
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
19089
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     1
 
--- gnome-games-2.17.1/dependencies/libggz/ggz.h.orig	2006-11-24 08:29:00.255847200 +0000
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     2
 
+++ gnome-games-2.17.1/dependencies/libggz/ggz.h	2006-11-24 08:31:48.712111900 +0000
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     3
 
@@ -2,7 +2,7 @@
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     4
 
  * @file   ggz.h
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     5
 
  * @author Brent M. Hendricks
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     6
 
  * @date   Fri Nov  2 23:32:17 2001
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     7
 
- * $Id: ggz.h,v 1.1 2006/10/14 10:27:47 andreasr Exp $
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     8
 
+ * $Id: ggz.h,v 1.4 2006/11/06 21:18:53 andreasr Exp $
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     9
 
  *
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    10
 
  * Header file for ggz components lib
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    11
 
  *
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    12
 
@@ -53,12 +53,14 @@
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    13
 
 #endif
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    14
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    15
 
 #if defined __GNUC__ && (__GNUC__ >= 3)
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    16
 
-#  define _GGZFUNCTION_
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    17
 
+#  define _GGZFUNCTION_ ""
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    18
 
+#elif defined(__sun)
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    19
 
+#  define _GGZFUNCTION_ ""
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    20
 
 #else
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    21
 
 #  ifndef __cplusplus
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    22
 
 #    define _GGZFUNCTION_ __FUNCTION__
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    23
 
 #  else
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    24
 
-#    define _GGZFUNCTION_
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    25
 
+#    define _GGZFUNCTION_ ""
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    26
 
 #  endif
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    27
 
 #endif
977f5478862e 2006-11-24 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    28
sustaining/oi_151a/spec-files