Changeset daae10f for lib

Timestamp:

2010-08-07T16:33:02Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7b87539

Parents:

289bd2d

Message:

OpenSolaris (non-gcc) fixes, patches from Dagobert Michelsen <dam@…>
with some changes.

Location:

lib

Files:

• Makefile (modified) (1 diff)
• md5.h (modified) (1 diff)
• oauth.c (modified) (1 diff)
• sha1.h (modified) (1 diff)
• xmltree.c (modified) (1 diff)

lib/Makefile

@@ -15 +15 @@
 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
 

lib/md5.h

@@ -27 +27 @@
 #include <sys/types.h>
 #include <gmodule.h>
+#if(__sun)
+#include <inttypes.h>
+#else
 #include <stdint.h>
+#endif
 
 typedef uint8_t md5_byte_t;

lib/oauth.c

@@ -60 +60 @@
         {
                 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 : "" );
         }
         

lib/sha1.h

@@ -24 +24 @@
 #define _SHA1_H_
 
+#if(__sun)
+#include <inttypes.h>
+#else
 #include <stdint.h>
+#endif
 #include <gmodule.h>
 

lib/xmltree.c

@@ -215 +215 @@
         
         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 )