gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / lib / gl_linked_list.c

diff --git a/lib/gl_linked_list.c b/lib/gl_linked_list.c
index e73dd5f..36d77f3 100644 (file)
--- a/lib/gl_linked_list.c
+++ b/lib/gl_linked_list.c
@@ -1,11 +1,11 @@
 /* Sequential list data type implemented by a linked list.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2013 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,20 +13,15 @@
    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/>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "gl_linked_list.h"
 
 #include <stdlib.h>
 
-#include "xalloc.h"
-
 /* -------------------------- gl_list_t Data Type -------------------------- */
 
 /* Generic linked list code.  */
@@ -36,21 +31,22 @@
 
 const struct gl_list_implementation gl_linked_list_implementation =
   {
-    gl_linked_create_empty,
-    gl_linked_create,
+    gl_linked_nx_create_empty,
+    gl_linked_nx_create,
     gl_linked_size,
     gl_linked_node_value,
+    gl_linked_node_nx_set_value,
     gl_linked_next_node,
     gl_linked_previous_node,
     gl_linked_get_at,
-    gl_linked_set_at,
-    gl_linked_search,
-    gl_linked_indexof,
-    gl_linked_add_first,
-    gl_linked_add_last,
-    gl_linked_add_before,
-    gl_linked_add_after,
-    gl_linked_add_at,
+    gl_linked_nx_set_at,
+    gl_linked_search_from_to,
+    gl_linked_indexof_from_to,
+    gl_linked_nx_add_first,
+    gl_linked_nx_add_last,
+    gl_linked_nx_add_before,
+    gl_linked_nx_add_after,
+    gl_linked_nx_add_at,
     gl_linked_remove_node,
     gl_linked_remove_at,
     gl_linked_remove,
@@ -60,7 +56,9 @@ const struct gl_list_implementation gl_linked_list_implementation =
     gl_linked_iterator_next,
     gl_linked_iterator_free,
     gl_linked_sortedlist_search,
+    gl_linked_sortedlist_search_from_to,
     gl_linked_sortedlist_indexof,
-    gl_linked_sortedlist_add,
+    gl_linked_sortedlist_indexof_from_to,
+    gl_linked_sortedlist_nx_add,
     gl_linked_sortedlist_remove
   };