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/wxwidgets-07-gsocket.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 2159 b8da719b8025
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2149
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     1
 
--- wxWidgets-2.8.10/src/gtk/gsockgtk.cpp-orig	2009-09-05 02:22:27.629408064 -0500
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     2
 
+++ wxWidgets-2.8.10/src/gtk/gsockgtk.cpp	2009-09-05 02:41:11.180272937 -0500
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     3
 
@@ -15,8 +15,10 @@
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     4
 
 #include <stdlib.h>
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     5
 
 #include <stdio.h>
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     6
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     7
 
+#define GSocket GlibGSocket
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     8
 
 #include <gdk/gdk.h>
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     9
 
 #include <glib.h>
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    10
 
+#undef GSocket
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    11
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    12
 
 #include "wx/gsocket.h"
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    13
 
 #include "wx/unix/gsockunx.h"
upstream/spec-files-extra