diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-07 17:33:02 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-07 17:33:02 +0100 |
| commit | daae10fbfe16bac26f74af91faf253d377f1b166 (patch) | |
| tree | e7870e81be568ab10abcc1bf8639a9191dbbb9c1 /lib | |
| parent | 289bd2d47ff58f42879ad50ebbc1b193831e4a78 (diff) | |
OpenSolaris (non-gcc) fixes, patches from Dagobert Michelsen <dam@opencsw.org>
with some changes.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 1 | ||||
| -rw-r--r-- | lib/md5.h | 4 | ||||
| -rw-r--r-- | lib/oauth.c | 2 | ||||
| -rw-r--r-- | lib/sha1.h | 4 | ||||
| -rw-r--r-- | lib/xmltree.c | 5 |
5 files changed, 13 insertions, 3 deletions
diff --git a/lib/Makefile b/lib/Makefile index 8fd9b19e..bebe3ba6 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -14,7 +14,6 @@ endif # [SH] Program variables objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o md5.o misc.o oauth.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o -CFLAGS += -Wall LFLAGS += -r # [SH] Phony targets @@ -26,7 +26,11 @@ #include <sys/types.h> #include <gmodule.h> +#if(__sun) +#include <inttypes.h> +#else #include <stdint.h> +#endif typedef uint8_t md5_byte_t; typedef struct MD5Context { diff --git a/lib/oauth.c b/lib/oauth.c index c60a5a52..57dd10f8 100644 --- a/lib/oauth.c +++ b/lib/oauth.c @@ -59,7 +59,7 @@ static char *oauth_sign( const char *method, const char *url, else { g_snprintf( (gchar*) key, HMAC_BLOCK_SIZE + 1, "%s&%s", - oi->sp->consumer_secret, oi->token_secret ? : "" ); + oi->sp->consumer_secret, oi->token_secret ? oi->token_secret : "" ); } /* Inner part: H(K XOR 0x36, text) */ @@ -23,7 +23,11 @@ #ifndef _SHA1_H_ #define _SHA1_H_ +#if(__sun) +#include <inttypes.h> +#else #include <stdint.h> +#endif #include <gmodule.h> #ifndef _SHA_enum_ diff --git a/lib/xmltree.c b/lib/xmltree.c index 31f8ee9c..b0a945ce 100644 --- a/lib/xmltree.c +++ b/lib/xmltree.c @@ -214,7 +214,10 @@ void xt_cleanup( struct xt_parser *xt, struct xt_node *node, int depth ) return; if( node == NULL ) - return xt_cleanup( xt, xt->root, depth ); + { + xt_cleanup( xt, xt->root, depth ); + return; + } if( node->flags & XT_SEEN && node == xt->root ) { |