[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header

[platform/upstream/glib.git] / glib / gbytes.h

diff --git a/glib/gbytes.h b/glib/gbytes.h
index a120e21..16f38aa 100644 (file)
--- a/glib/gbytes.h
+++ b/glib/gbytes.h
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt@desrt.ca>
  *         Stef Walter <stefw@collabora.co.uk>
@@ -24,48 +22,74 @@
 #ifndef __G_BYTES_H__
 #define __G_BYTES_H__
 
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
 #include <glib/gtypes.h>
 #include <glib/garray.h>
 
 G_BEGIN_DECLS
 
+GLIB_AVAILABLE_IN_ALL
 GBytes *        g_bytes_new                     (gconstpointer   data,
                                                  gsize           size);
 
+GLIB_AVAILABLE_IN_ALL
 GBytes *        g_bytes_new_take                (gpointer        data,
                                                  gsize           size);
 
+#ifdef G_OS_UNIX
+GLIB_AVAILABLE_IN_2_44
+GBytes *        g_bytes_new_take_zero_copy_fd   (gint            fd);
+#endif
+
+GLIB_AVAILABLE_IN_ALL
 GBytes *        g_bytes_new_static              (gconstpointer   data,
                                                  gsize           size);
 
+GLIB_AVAILABLE_IN_ALL
 GBytes *        g_bytes_new_with_free_func      (gconstpointer   data,
                                                  gsize           size,
                                                  GDestroyNotify  free_func,
                                                  gpointer        user_data);
 
+GLIB_AVAILABLE_IN_ALL
 GBytes *        g_bytes_new_from_bytes          (GBytes         *bytes,
                                                  gsize           offset,
                                                  gsize           length);
 
+GLIB_AVAILABLE_IN_ALL
 gconstpointer   g_bytes_get_data                (GBytes         *bytes,
                                                  gsize          *size);
 
+GLIB_AVAILABLE_IN_ALL
 gsize           g_bytes_get_size                (GBytes         *bytes);
 
+GLIB_AVAILABLE_IN_2_44
+gint            g_bytes_get_zero_copy_fd        (GBytes         *bytes);
+
+GLIB_AVAILABLE_IN_ALL
 GBytes *        g_bytes_ref                     (GBytes         *bytes);
 
+GLIB_AVAILABLE_IN_ALL
 void            g_bytes_unref                   (GBytes         *bytes);
 
+GLIB_AVAILABLE_IN_ALL
 gpointer        g_bytes_unref_to_data           (GBytes         *bytes,
                                                  gsize          *size);
 
+GLIB_AVAILABLE_IN_ALL
 GByteArray *    g_bytes_unref_to_array          (GBytes         *bytes);
 
+GLIB_AVAILABLE_IN_ALL
 guint           g_bytes_hash                    (gconstpointer   bytes);
 
+GLIB_AVAILABLE_IN_ALL
 gboolean        g_bytes_equal                   (gconstpointer   bytes1,
                                                  gconstpointer   bytes2);
 
+GLIB_AVAILABLE_IN_ALL
 gint            g_bytes_compare                 (gconstpointer   bytes1,
                                                  gconstpointer   bytes2);