- Thu Dec 14 03:39:34 UTC 2000

[libfaim.git] / aim_util.c

diff --git a/aim_util.c b/aim_util.c
index 77a3ba3982eb67e9dd47f0d94f31758241279a42..6ab4f38e206a50de8219443a161b66263fe36a4a 100644 (file)
--- a/aim_util.c
+++ b/aim_util.c
@@ -7,18 +7,16 @@
 #include <faim/aim.h>
 #include <ctype.h>
 
-#define AIMUTIL_USEMACROS
-
 #ifdef AIMUTIL_USEMACROS
 /* macros in faim/aim.h */
 #else
-inline int aimutil_put8(u_char *buf, u_char data)
+faim_shortfunc int aimutil_put8(u_char *buf, u_char data)
 {
   buf[0] = (u_char)data&0xff;
   return 1;
 }
 
-inline u_char aimutil_get8(u_char *buf)
+faim_shortfunc u_char aimutil_get8(u_char *buf)
 {
   return buf[0];
 }
@@ -26,14 +24,14 @@ inline u_char aimutil_get8(u_char *buf)
 /*
  * Endian-ness issues here?
  */
-inline int aimutil_put16(u_char *buf, u_short data)
+faim_shortfunc int aimutil_put16(u_char *buf, u_short data)
 {
   buf[0] = (u_char)(data>>8)&0xff;
   buf[1] = (u_char)(data)&0xff;
   return 2;
 }
 
-inline u_short aimutil_get16(u_char *buf)
+faim_shortfunc u_short aimutil_get16(u_char *buf)
 {
   u_short val;
   val = (buf[0] << 8) & 0xff00;
@@ -41,7 +39,7 @@ inline u_short aimutil_get16(u_char *buf)
   return val;
 }
 
-inline int aimutil_put32(u_char *buf, u_long data)
+faim_shortfunc int aimutil_put32(u_char *buf, u_long data)
 {
   buf[0] = (u_char)(data>>24)&0xff;
   buf[1] = (u_char)(data>>16)&0xff;
@@ -50,7 +48,7 @@ inline int aimutil_put32(u_char *buf, u_long data)
   return 4;
 }
 
-inline u_long aimutil_get32(u_char *buf)
+faim_shortfunc u_long aimutil_get32(u_char *buf)
 {
   u_long val;
   val = (buf[0] << 24) & 0xff000000;
@@ -61,7 +59,7 @@ inline u_long aimutil_get32(u_char *buf)
 }
 #endif /* AIMUTIL_USEMACROS */
 
-inline int aimutil_putstr(u_char *dest, const u_char *src, int len)
+faim_export faim_shortfunc int aimutil_putstr(u_char *dest, const char *src, int len)
 {
   memcpy(dest, src, len);
   return len;
@@ -72,7 +70,7 @@ inline int aimutil_putstr(u_char *dest, const u_char *src, int len)
  *   -- DMP.
  *
  */
-int aimutil_tokslen(char *toSearch, int index, char dl)
+faim_export int aimutil_tokslen(char *toSearch, int index, char dl)
 {
   int curCount = 1;
   char *next;
@@ -97,7 +95,7 @@ int aimutil_tokslen(char *toSearch, int index, char dl)
   return toReturn;
 }
 
-int aimutil_itemcnt(char *toSearch, char dl)
+faim_export int aimutil_itemcnt(char *toSearch, char dl)
 {
   int curCount;
   char *next;
@@ -115,7 +113,7 @@ int aimutil_itemcnt(char *toSearch, char dl)
   return curCount;
 }
 
-char *aimutil_itemidx(char *toSearch, int index, char dl)
+faim_export char *aimutil_itemidx(char *toSearch, int index, char dl)
 {
   int curCount;
   char *next;
@@ -171,7 +169,7 @@ char *aimutil_itemidx(char *toSearch, int index, char dl)
  * return is equal to that of strlen().
  *
  */
-int aim_snlen(const char *sn)
+faim_export int aim_snlen(const char *sn)
 {
   int i = 0;
   const char *curPtr = NULL;
@@ -202,7 +200,7 @@ int aim_snlen(const char *sn)
  *
  */
 
-int aim_sncmp(const char *sn1, const char *sn2)
+faim_export int aim_sncmp(const char *sn1, const char *sn2)
 {
   const char *curPtr1 = NULL, *curPtr2 = NULL;
 
@@ -248,7 +246,7 @@ int aim_sncmp(const char *sn1, const char *sn2)
 
 /* Minor changes by and1000 on 15/1/97 to make it go under Nemesis */
 
-char *aim_strsep(char **pp, const char *delim)
+faim_export char *aim_strsep(char **pp, const char *delim)
 {
   char *p, *q;