Do only one call to GetVersionEx in the common case.

[pspp] / lib / gl_oset.h

diff --git a/lib/gl_oset.h b/lib/gl_oset.h
index 5a681eefd5479f995f837d916d58557c8926135d..a609a134cb2653d785b8b30aaf234195ffe5dc4c 100644 (file)
--- a/lib/gl_oset.h
+++ b/lib/gl_oset.h
@@ -1,11 +1,11 @@
 /* Abstract ordered set data type.
-   Copyright (C) 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _GL_OSET_H
 #define _GL_OSET_H
@@ -169,7 +168,7 @@ struct gl_oset_implementation
                          gl_setelement_threshold_fn threshold_fn,
                          const void *threshold, const void **eltp);
   bool (*add) (gl_oset_t set, const void *elt);
-  bool (*remove) (gl_oset_t set, const void *elt);
+  bool (*remove_elt) (gl_oset_t set, const void *elt);
   void (*oset_free) (gl_oset_t set);
   /* gl_oset_iterator_t functions.  */
   gl_oset_iterator_t (*iterator) (gl_oset_t set);
@@ -234,7 +233,8 @@ gl_oset_add (gl_oset_t set, const void *elt)
 static inline bool
 gl_oset_remove (gl_oset_t set, const void *elt)
 {
-  return ((const struct gl_oset_impl_base *) set)->vtable->remove (set, elt);
+  return ((const struct gl_oset_impl_base *) set)->vtable
+        ->remove_elt (set, elt);
 }
 
 # define gl_oset_free gl_oset_free_inline