summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2012-06-26 01:58:04 +0000
committerJason Woodward2012-06-26 01:58:41 +0000
commitf9ad0aab997785b1bb0348f8ea9f1e9b5f0989f2 (patch)
tree910038026fd024bee9bd7bd2f5cdc727f986539b
parent7ab7414bae56ee0646c6836990e9725ad95ee86e (diff)
downloadslapt-get-f9ad0aab997785b1bb0348f8ea9f1e9b5f0989f2.tar.gz
remove __inline attributes for various functions as they clash with c99
-rw-r--r--ChangeLog3
-rw-r--r--src/common.c4
-rw-r--r--src/common.h4
-rw-r--r--src/package.c2
-rw-r--r--src/package.h2
5 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fbdd61..e2f2f33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-0.10.2n May 20, 2012
+0.10.2n June 25, 2012
+ * remove __inline attributes for various functions as they clash with c99
* Update pasture URL fixup for no sub directory packages
* updated zlib usage to fix "expected 'gzFile' but argument is of type
'struct gzFile_s **'". Thanks Igor.
diff --git a/src/common.c b/src/common.c
index 35a22ff..a4a417d 100644
--- a/src/common.c
+++ b/src/common.c
@@ -273,7 +273,7 @@ char *slapt_str_replace_chr(const char *string,const char find,
return clean;
}
-__inline void *slapt_malloc(size_t s)
+void *slapt_malloc(size_t s)
{
void *p;
if ( ! (p = malloc(s)) ) {
@@ -287,7 +287,7 @@ __inline void *slapt_malloc(size_t s)
return p;
}
-__inline void *slapt_calloc(size_t n,size_t s)
+void *slapt_calloc(size_t n,size_t s)
{
void *p;
if ( ! (p = calloc(n,s)) ) {
diff --git a/src/common.h b/src/common.h
index eaa068a..3c29153 100644
--- a/src/common.h
+++ b/src/common.h
@@ -70,8 +70,8 @@ void slapt_gen_md5_sum_of_file(FILE *f,char *result_sum);
int slapt_ask_yes_no(const char *format, ...);
char *slapt_str_replace_chr(const char *string,const char find,
const char replace);
-__inline void *slapt_malloc(size_t s);
-__inline void *slapt_calloc(size_t n,size_t s);
+void *slapt_malloc(size_t s);
+void *slapt_calloc(size_t n,size_t s);
/* return human readable error */
const char *slapt_strerror(slapt_code_t code);
diff --git a/src/package.c b/src/package.c
index 886347f..68b63a4 100644
--- a/src/package.c
+++ b/src/package.c
@@ -2172,7 +2172,7 @@ void slapt_add_pkg_to_pkg_list(slapt_pkg_list_t *list,
}
-__inline slapt_pkg_info_t *slapt_init_pkg(void)
+slapt_pkg_info_t *slapt_init_pkg(void)
{
slapt_pkg_info_t *pkg;
diff --git a/src/package.h b/src/package.h
index 924cdbf..db98e8c 100644
--- a/src/package.h
+++ b/src/package.h
@@ -81,7 +81,7 @@ typedef struct {
} slapt_pkg_err_list_t;
/* returns an empty package structure */
-__inline slapt_pkg_info_t *slapt_init_pkg(void);
+slapt_pkg_info_t *slapt_init_pkg(void);
/* frees the package structure */
void slapt_free_pkg(slapt_pkg_info_t *pkg);