~saiarcot895/ubuntu/trusty/openscenegraph/armhf-support

« back to all changes in this revision

Viewing changes to debian/patches/check__FreeBSD_kernel__

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs
  • Date: 2013-11-12 02:21:14 UTC
  • mfrom: (31.1.3 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20131112022114-qaxfhdnhn88vnh10
Tags: 3.2.0~rc1-1ubuntu1
Fix deprecated url_feof.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Index: openscenegraph/OpenSceneGraph/applications/present3D/Cluster.cpp
 
1
Index: osggit/OpenSceneGraph/applications/present3D/Cluster.cpp
2
2
===================================================================
3
 
--- openscenegraph.orig/OpenSceneGraph/applications/present3D/Cluster.cpp       2011-05-05 09:38:53.000000000 +0200
4
 
+++ openscenegraph/OpenSceneGraph/applications/present3D/Cluster.cpp    2011-05-05 09:39:53.000000000 +0200
 
3
--- osggit.orig/OpenSceneGraph/applications/present3D/Cluster.cpp       2013-06-21 17:26:41.000000000 +0200
 
4
+++ osggit/OpenSceneGraph/applications/present3D/Cluster.cpp    2013-06-21 17:26:41.000000000 +0200
5
5
@@ -33,7 +33,7 @@
6
6
 #if defined(__linux)
7
7
     #include <unistd.h>
8
8
     #include <linux/sockios.h>
9
 
-#elif defined(__FreeBSD__)
10
 
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 
9
-#elif defined(__FreeBSD__) || defined(__DragonFly__)
 
10
+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
11
11
     #include <unistd.h>
12
12
     #include <sys/sockio.h>
13
13
 #elif defined(__sgi)