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/fireflies-02-solaris.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 1175 41d9fb018a04
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1175
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
     1
 
--- fireflies-2.07/src/main.cc.orig	Mon Jun 23 16:55:04 2003
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
     2
 
+++ fireflies-2.07/src/main.cc	Fri Mar  7 01:13:41 2008
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
     3
 
@@ -14,7 +14,7 @@
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
     4
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
     5
 
 #ifdef WIN32
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
     6
 
 #include <windows.h>
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
     7
 
-#else
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
     8
 
+#elif defined(__GNU__)
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
     9
 
 #include <argp.h>
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
    10
 
 #endif
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
    11
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
    12
 
@@ -26,7 +26,7 @@
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
    13
 
 int mspf = 1000/30;
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
    14
 
 bool full_screen = false;
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
    15
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
    16
 
-#ifdef WIN32
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
    17
 
+#if defined(WIN32) || !defined(__GNU__)
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
    18
 
 // mingw doesn't have argp. implement half-assed version
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
    19
41d9fb018a04 2008-05-31 Albert Lee <[email protected]>
trisk
parents:
diff changeset 
    20
 
 #define OPTION_HIDDEN 1
upstream/spec-files-extra