summaryrefslogtreecommitdiff
path: root/gl/override
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2011-11-09 00:43:58 +0100
committerSimon Josefsson <simon@josefsson.org>2011-11-09 00:48:15 +0100
commit21caff388b360fca7a774ed5206447ba9ebf4f94 (patch)
tree0ff149b18a77253e9cb9f5a6a26102cc7b2d83f4 /gl/override
parentfe0a92df94869abd48a8e7a576f9b81867a9c420 (diff)
downloadgnutls-21caff388b360fca7a774ed5206447ba9ebf4f94.tar.gz
Simplify static library renaming hack.
Diffstat (limited to 'gl/override')
-rw-r--r--gl/override/lib/read-file.c.diff38
-rw-r--r--gl/override/lib/read-file.h.diff16
-rw-r--r--gl/override/tests/test-read-file.c.diff20
3 files changed, 0 insertions, 74 deletions
diff --git a/gl/override/lib/read-file.c.diff b/gl/override/lib/read-file.c.diff
deleted file mode 100644
index 2907631df9..0000000000
--- a/gl/override/lib/read-file.c.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- read-file.c.orig
-+++ read-file.c
-@@ -41,7 +41,7 @@
- *LENGTH. On errors, *LENGTH is undefined, errno preserves the
- values set by system functions (if any), and NULL is returned. */
- char *
--fread_file (FILE *stream, size_t *length)
-+gl_fread_file (FILE *stream, size_t *length)
- {
- char *buf = NULL;
- size_t alloc = BUFSIZ;
-@@ -145,7 +145,7 @@ internal_read_file (const char *filename, size_t *length, const char *mode)
- if (!stream)
- return NULL;
-
-- out = fread_file (stream, length);
-+ out = gl_fread_file (stream, length);
-
- save_errno = errno;
-
-@@ -170,7 +170,7 @@ internal_read_file (const char *filename, size_t *length, const char *mode)
- undefined, errno preserves the values set by system functions (if
- any), and NULL is returned. */
- char *
--read_file (const char *filename, size_t *length)
-+gl_read_file (const char *filename, size_t *length)
- {
- return internal_read_file (filename, length, "r");
- }
-@@ -183,7 +183,7 @@ read_file (const char *filename, size_t *length)
- preserves the values set by system functions (if any), and NULL is
- returned. */
- char *
--read_binary_file (const char *filename, size_t *length)
-+gl_read_binary_file (const char *filename, size_t *length)
- {
- return internal_read_file (filename, length, "rb");
- }
diff --git a/gl/override/lib/read-file.h.diff b/gl/override/lib/read-file.h.diff
deleted file mode 100644
index 3731bc7ffe..0000000000
--- a/gl/override/lib/read-file.h.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- read-file.h.orig
-+++ read-file.h
-@@ -25,10 +25,10 @@
- /* Get FILE. */
- #include <stdio.h>
-
--extern char *fread_file (FILE * stream, size_t * length);
-+extern char *gl_fread_file (FILE * stream, size_t * length);
-
--extern char *read_file (const char *filename, size_t * length);
-+extern char *gl_read_file (const char *filename, size_t * length);
-
--extern char *read_binary_file (const char *filename, size_t * length);
-+extern char *gl_read_binary_file (const char *filename, size_t * length);
-
- #endif /* READ_FILE_H */
diff --git a/gl/override/tests/test-read-file.c.diff b/gl/override/tests/test-read-file.c.diff
deleted file mode 100644
index 1c25c30332..0000000000
--- a/gl/override/tests/test-read-file.c.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- test-read-file.c.orig
-+++ test-read-file.c
-@@ -37,7 +37,7 @@ main (void)
- if (stat (FILE1, &statbuf) >= 0)
- {
- size_t len;
-- char *out = read_file (FILE1, &len);
-+ char *out = gl_read_file (FILE1, &len);
-
- if (!out)
- {
-@@ -79,7 +79,7 @@ main (void)
- if (stat (FILE2, &statbuf) >= 0)
- {
- size_t len;
-- char *out = read_file (FILE2, &len);
-+ char *out = gl_read_file (FILE2, &len);
-
- if (!out)
- {