gsocket: Set SO_NOSIGPIPE on sockets on Darwin

[platform/upstream/glib.git] / gio / gvdb / gvdb-format.h

diff --git a/gio/gvdb/gvdb-format.h b/gio/gvdb/gvdb-format.h
index 41c8254..486e854 100644 (file)
--- a/gio/gvdb/gvdb-format.h
+++ b/gio/gvdb/gvdb-format.h
@@ -12,9 +12,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>
  */
@@ -24,8 +22,8 @@
 
 #include <glib.h>
 
-typedef struct { guint16 __value; } guint16_le;
-typedef struct { guint32 __value; } guint32_le;
+typedef struct { guint16 value; } guint16_le;
+typedef struct { guint32 value; } guint32_le;
 
 struct gvdb_pointer {
   guint32_le start;
@@ -51,8 +49,6 @@ struct gvdb_hash_item {
     struct gvdb_pointer pointer;
     gchar direct[8];
   } value;
-
-  struct gvdb_pointer options;
 };
 
 struct gvdb_header {
@@ -69,7 +65,7 @@ static inline guint32_le guint32_to_le (guint32 value) {
 }
 
 static inline guint32 guint32_from_le (guint32_le value) {
-  return GUINT32_FROM_LE (value.__value);
+  return GUINT32_FROM_LE (value.value);
 }
 
 static inline guint16_le guint16_to_le (guint16 value) {
@@ -78,7 +74,7 @@ static inline guint16_le guint16_to_le (guint16 value) {
 }
 
 static inline guint16 guint16_from_le (guint16_le value) {
-  return GUINT16_FROM_LE (value.__value);
+  return GUINT16_FROM_LE (value.value);
 }
 
 #define GVDB_SIGNATURE0 1918981703