[svn-r16920] Description:

    Merge these trunk revisions which occurred during the 1.8.3 release code
freeze back to the 1.8 branch:

    From Quincey: 16845 16847 16849 16851 16858 16869 16897

    From Ray: 16859 16880

    From Allen: 16863

Tested on:
    FreeBSD/32 6.3 (duty) in debug mode
    FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
    Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
        in debug mode
    Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
        w/C++ & FORTRAN, in production mode
    Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
        w/szip filter, in production mode
    Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
        in production mode
    Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
    Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
    Mac OS X/32 10.5.6 (amazon) in debug mode
    Mac OS X/32 10.5.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
        in production mode

1 files changed, 3 insertions, 13 deletions

diff --git a/src/H5FL.c b/src/H5FL.c
index dca300c..c72491d 100644
--- a/src/H5FL.c
+++ b/src/H5FL.c
@@ -101,10 +101,10 @@ typedef struct H5FL_blk_gc_list_t {
 static H5FL_blk_gc_list_t H5FL_blk_gc_head={0,NULL};
 
 /* A garbage collection node for factory free lists */
-typedef struct H5FL_fac_gc_node_t {
+struct H5FL_fac_gc_node_t {
     H5FL_fac_head_t *list;              /* Pointer to the head of the list to garbage collect */
     struct H5FL_fac_gc_node_t *next;    /* Pointer to the next node in the list of things to garbage collect */
-} H5FL_fac_gc_node_t;
+};
 
 /* The garbage collection head for factory free lists */
 typedef struct H5FL_fac_gc_list_t {
@@ -113,18 +113,8 @@ typedef struct H5FL_fac_gc_list_t {
 } H5FL_fac_gc_list_t;
 
 /* Data structure to store each block in factory free list */
-typedef struct H5FL_fac_node_t {
+struct H5FL_fac_node_t {
     struct H5FL_fac_node_t *next;   /* Pointer to next block in free list */
-} H5FL_fac_node_t;
-
-/* Data structure for free list block factory */
-struct H5FL_fac_head_t {
-    unsigned init;      /* Whether the free list has been initialized */
-    unsigned allocated; /* Number of blocks allocated */
-    unsigned onlist;    /* Number of blocks on free list */
-    size_t size;        /* Size of the blocks in the list */
-    H5FL_fac_node_t *list;  /* List of free blocks */
-    H5FL_fac_gc_node_t *prev_gc; /* Previous garbage collection node in list */
 };
 
 /* The head of the list of factory things to garbage collect */