← Back to branch summary

~ubuntu-branches/ubuntu/saucy/orbit2/saucy

« back to all changes in this revision

Viewing changes to debian/patches/101-g_assert.patch

  • Committer: Bazaar Package Importer
  • Author(s): Loic Minier
  • Date: 2008-01-25 12:34:42 UTC
  • mfrom: (1.2.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20080125123442-ng7dese7qblcrc8l
Tags: 1:2.14.11-0ubuntu1
* Merge with Debian; no remaining Ubuntu changes.
  - Set Maintainer to Ubuntu Desktop Team.
* New upstream release; no API change; bug fixes.
  - Upstream NEWS:
    . Fix off by one in all method name lengths
      Fixes interoperability with other ORBs (J. Specht)
  - Update autoreconf patch, 700-autoreconf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/101-g_assert.patch
1
 
--- ./include/orbit/GIOP/giop-endian.h.orig     2007-09-10 12:11:47.000000000 +0000
2
 
+++ ./include/orbit/GIOP/giop-endian.h  2008-01-25 11:27:27.000000000 +0000
3
 
@@ -8,9 +8,12 @@
4
 
 #ifdef ORBIT2_INTERNAL_API
5
 
 
6
 
 /* This is also defined in IIOP-types.c */
7
 
+#if 0
8
 
+// error: static declaration of 'giop_byteswap' follows non-static declaration
9
 
 void giop_byteswap(guchar *outdata,
10
 
                   const guchar *data,
11
 
                   gulong datalen);
12
 
+#endif
13
 
 
14
 
 #if defined(G_CAN_INLINE) && !defined(GIOP_DO_NOT_INLINE_IIOP_BYTESWAP)
15
 
 G_INLINE_FUNC void giop_byteswap(guchar *outdata,