[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [pdf-devel] [PATCH] Static inlining
|
From: |
David Vazquez |
|
Subject: |
Re: [pdf-devel] [PATCH] Static inlining |
|
Date: |
Tue, 19 May 2009 20:40:48 +0200 |
|
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) |
Sorry, I forgot to commit. Here the patch.
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: http://bzr.savannah.gnu.org/r/pdf/libgnupdf/branches\
# /trunk/
# testament_sha1: 161abd2789ce6013ca887464933a23ead59cdd9a
# timestamp: 2009-05-19 20:37:29 +0200
# base_revision_id: address@hidden
#
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog 2009-05-11 14:47:49 +0000
+++ ChangeLog 2009-05-19 18:37:15 +0000
@@ -1,3 +1,11 @@
+2009-05-19 David Vazquez <address@hidden>
+
+ * src/base/pdf-crypt.h: Use STATIC_INLINE indeed of EXTERN_INLINE.
+
+ * src/base/pdf-list.h: Use STATIC_INLINE indeed of EXTERN_INLINE.
+
+ * src/base/pdf-types.h: Remove EXTERN_INLINE macro.
+
2009-05-11 David Vazquez <address@hidden>
* doc/gnupdf.texi (Debugging procedures): Documentation for
=== modified file 'src/base/pdf-crypt.h'
--- src/base/pdf-crypt.h 2009-05-07 09:22:08 +0000
+++ src/base/pdf-crypt.h 2009-05-19 18:37:15 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: C -*- Time-stamp: "09/05/07 11:17:46 jemarch"
+/* -*- mode: C -*- Time-stamp: "2009-05-19 20:32:45 davazp"
*
* File: pdf-crypt.c
* Date: Fri Feb 22 21:05:05 2008
@@ -136,14 +136,17 @@
#else
-#if defined(COMPILING_PDF_CRYPT)
-# undef EXTERN_INLINE
-# define EXTERN_INLINE
+#if defined (COMPILING_PDF_CRYPT)
+# define STATIC_INLINE
+#else
+# define STATIC_INLINE static inline
#endif /* COMPILING_PDF_CRYPT */
+
#include <gcrypt.h>
-EXTERN_INLINE pdf_status_t
+
+STATIC_INLINE pdf_status_t
pdf_crypt_init (void)
{
gcry_check_version (GCRYPT_VERSION);
@@ -151,7 +154,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_crypt_nonce (pdf_char_t * buffer, pdf_size_t size)
{
gcry_create_nonce (buffer, size);
@@ -160,7 +163,7 @@
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_crypt_cipher_new (enum pdf_crypt_cipher_algo_e algorithm,
pdf_crypt_cipher_t *cipher)
{
@@ -210,7 +213,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_crypt_cipher_setkey (pdf_crypt_cipher_t cipher,
pdf_char_t *key, pdf_size_t size)
{
@@ -218,7 +221,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_crypt_cipher_encrypt (pdf_crypt_cipher_t cipher,
pdf_char_t *out, pdf_size_t out_size,
pdf_char_t *in, pdf_size_t in_size,
@@ -228,7 +231,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_crypt_cipher_decrypt (pdf_crypt_cipher_t cipher,
pdf_char_t *out, pdf_size_t out_size,
pdf_char_t *in, pdf_size_t in_size,
@@ -238,7 +241,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_crypt_cipher_destroy (pdf_crypt_cipher_t cipher)
{
pdf_status_t ret;
@@ -253,7 +256,7 @@
/* Hashing functions */
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_crypt_md_new (enum pdf_crypt_md_algo_e algo, pdf_crypt_md_t *_md)
{
pdf_crypt_md_t md;
@@ -288,7 +291,7 @@
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_crypt_md_write (pdf_crypt_md_t md,
pdf_char_t *in, pdf_size_t in_size)
{
@@ -298,7 +301,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_crypt_md_read (pdf_crypt_md_t md,
pdf_char_t *out, pdf_size_t out_size)
{
@@ -332,7 +335,7 @@
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_crypt_md_destroy (pdf_crypt_md_t md)
{
pdf_dealloc (md->raw);
=== modified file 'src/base/pdf-list.h'
--- src/base/pdf-list.h 2009-05-07 09:22:08 +0000
+++ src/base/pdf-list.h 2009-05-19 18:37:15 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: C -*- Time-stamp: "09/05/07 11:16:19 jemarch"
+/* -*- mode: C -*- Time-stamp: "2009-05-19 20:32:37 davazp"
*
* File: pdf-list.h
* Date: Sat Mar 1 02:14:35 2008
@@ -172,18 +172,20 @@
/* END PUBLIC */
#else
+
/* Inlined versions of the functions */
#if defined(COMPILING_PDF_LIST)
-# undef EXTERN_INLINE
-# define EXTERN_INLINE
+# define STATIC_INLINE
+#else
+# define STATIC_INLINE static inline
#endif /* COMPILING_PDF_LIST */
#include <gl_array_list.h>
/* Creation and destruction functions */
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_new (pdf_list_element_equals_fn_t equals_fn,
pdf_list_element_dispose_fn_t dispose_fn,
const pdf_bool_t allow_duplicates,
@@ -212,7 +214,7 @@
return (st);
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_destroy (pdf_list_t list)
{
gl_list_free ((gl_list_t) list.gl_list);
@@ -221,7 +223,7 @@
/* Property management functions */
-EXTERN_INLINE pdf_size_t
+STATIC_INLINE pdf_size_t
pdf_list_size (const pdf_list_t list)
{
return ((pdf_size_t) gl_list_size((gl_list_t) list.gl_list));
@@ -229,7 +231,7 @@
/* Element searching functions */
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_search (const pdf_list_t list,
const void* element,
pdf_list_node_t *node)
@@ -253,7 +255,7 @@
return (st);
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_search_from (const pdf_list_t list,
const pdf_size_t start_index,
const void* element,
@@ -288,7 +290,7 @@
return (st);
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_search_from_to (const pdf_list_t list,
const pdf_size_t start_index,
const pdf_size_t end_index,
@@ -328,7 +330,7 @@
return (st);
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_next_node (const pdf_list_t list,
const pdf_list_node_t node,
pdf_list_node_t *next)
@@ -355,7 +357,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_previous_node (const pdf_list_t list, const pdf_list_node_t node,
pdf_list_node_t *prev)
{
pdf_status_t st;
@@ -379,7 +381,7 @@
return (st);
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_indexof (const pdf_list_t list,
const void *element,
pdf_size_t *position)
@@ -406,7 +408,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_indexof_from (const pdf_list_t list,
const pdf_size_t start_index,
const void *element,
@@ -442,7 +444,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_indexof_from_to (const pdf_list_t list,
const pdf_size_t start_index,
const pdf_size_t end_index,
@@ -485,7 +487,7 @@
/* Element setting and getting functions */
-EXTERN_INLINE const void *
+STATIC_INLINE const void *
pdf_list_node_value (const pdf_list_t list, const pdf_list_node_t node)
{
return (gl_list_node_value ((gl_list_t)list.gl_list,
@@ -493,7 +495,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_get_at (const pdf_list_t list,
const pdf_size_t position,
const void **value)
@@ -523,7 +525,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_set_at (pdf_list_t list,
const pdf_size_t position,
const void *element,
@@ -567,7 +569,7 @@
/* Element addition and removal functions */
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_add_first (pdf_list_t list,
const void* element,
pdf_list_node_t *node)
@@ -595,7 +597,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_add_last (pdf_list_t list,
const void* element,
pdf_list_node_t *node)
@@ -623,7 +625,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_add_at (pdf_list_t list,
const pdf_size_t position,
const void *element,
@@ -664,7 +666,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_remove_node (pdf_list_t list, const pdf_list_node_t node)
{
gl_list_remove_node ((gl_list_t)list.gl_list, (gl_list_node_t)node.gl_node);
@@ -672,7 +674,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_remove_at (pdf_list_t list, const pdf_size_t position)
{
pdf_status_t st;
@@ -693,7 +695,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_remove (pdf_list_t list, const void * element)
{
pdf_status_t st;
@@ -710,7 +712,7 @@
/* Element iterator functions */
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_iterator (const pdf_list_t list,
pdf_list_iterator_t *itr)
{
@@ -732,7 +734,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_iterator_from_to (const pdf_list_t list, const pdf_size_t start_index,
const pdf_size_t end_index,
pdf_list_iterator_t *itr)
@@ -765,7 +767,7 @@
return st;
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_iterator_next (pdf_list_iterator_t *iterator,
const void **element_pointer,
pdf_list_node_t *node_pointer)
@@ -782,7 +784,7 @@
return st;
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_iterator_free (pdf_list_iterator_t *iterator)
{
gl_list_iterator_free ((gl_list_iterator_t*)(iterator->gl_iterator));
@@ -791,7 +793,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_sorted_add (pdf_list_t list, pdf_list_element_compar_fn_t compar_fn,
const void* element, pdf_list_node_t * element_node)
{
@@ -818,7 +820,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_sorted_remove (pdf_list_t list, pdf_list_element_compar_fn_t
compar_fn,
const void * element)
{
@@ -840,7 +842,7 @@
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_sorted_search (const pdf_list_t list, pdf_list_element_compar_fn_t
compar_fn,
const void* element, pdf_list_node_t *node)
{
@@ -866,7 +868,7 @@
return (st);
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_sorted_search_from_to (const pdf_list_t list,
pdf_list_element_compar_fn_t compar_fn,
const pdf_size_t start_index, const pdf_size_t
end_index,
@@ -905,7 +907,7 @@
return (st);
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_sorted_indexof (const pdf_list_t list,
pdf_list_element_compar_fn_t compar_fn,
const void* element, pdf_size_t *position)
@@ -932,7 +934,7 @@
return (st);
}
-EXTERN_INLINE pdf_status_t
+STATIC_INLINE pdf_status_t
pdf_list_sorted_indexof_from_to (const pdf_list_t list,
pdf_list_element_compar_fn_t compar_fn,
const pdf_size_t start_index, const
pdf_size_t end_index,
=== modified file 'src/base/pdf-types.h'
--- src/base/pdf-types.h 2009-05-07 10:20:49 +0000
+++ src/base/pdf-types.h 2009-05-19 18:37:15 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: C -*- Time-stamp: "09/05/07 12:18:09 jemarch"
+/* -*- mode: C -*- Time-stamp: "2009-05-19 19:24:11 davazp"
*
* File: pdf-types.h
* Date: Sun Feb 10 21:30:00 2008
@@ -474,30 +474,6 @@
/* END PUBLIC */
-/* GCC has `__inline__' in all modes, including strict ansi. GCC 4.3 and
- above with `-std=c99' or `-std=gnu99' implements ISO C99 inline semantics,
- unless `-fgnu89-inline' is used. Here we want GNU "extern inline"
- semantics, hence the `__gnu_inline__' attribute, in accordance with:
- http://gcc.gnu.org/gcc-4.3/porting_to.html .
-
- With GCC 4.2, `__GNUC_STDC_INLINE__' is never defined (because C99 inline
- semantics are not supported), but a warning is issued in C99 mode if
- `__gnu_inline__' is not used.
-
- Apple's GCC build >5400 (since Xcode 3.0) doesn't support GNU inline in
- C99 mode and doesn't define `__GNUC_STDC_INLINE__'. Fall back to "static
- inline" in that case. */
-
-# if (defined __GNUC__) && (!(__APPLE_CC__ > 5400 && __STDC_VERSION__ >=
199901L))
-# if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2)
-# define EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
-# else
-# define EXTERN_INLINE extern __inline__
-# endif
-# elif (defined SCM_C_INLINE)
-# define EXTERN_INLINE static SCM_C_INLINE
-# endif
-
#endif /* !PDF_TYPES_H */
/* End of pdf-types.h */
# Begin bundle
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