# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1053196862 0
# Node ID 2d9f7d2e35584800be49de2b28af6ce6c80a98a5
# Parent  573501c63fef8e4e73095c93c7b70c5ad9ee28b8
[gaim-migrate @ 5790]
Removed faim_shortfunc, which was supposed to make 2 functions be
declared as inline.  There was a patch saying this caused problems
with systems where inline was redefined to be something else in
config.h, and I would rather not have config.h included in libfaim
files.

I'm also think the speed difference between having inline and not
having it for these 2 functions is negligible, especially when not
compiling with -Oanything.

committer: Tailor Script <tailor@pidgin.im>

diff -r 573501c63fef -r 2d9f7d2e3558 src/protocols/oscar/aim.h
--- a/src/protocols/oscar/aim.h	Sat May 17 17:54:38 2003 +0000
+++ b/src/protocols/oscar/aim.h	Sat May 17 18:41:02 2003 +0000
@@ -46,12 +46,6 @@
 #define gethostbyname(x) gethostbyname2(x, AF_INET) 
 #endif
 
-#if defined(_WIN32) || defined(STRICT_ANSI)
-#define faim_shortfunc
-#else
-#define faim_shortfunc inline
-#endif
-
 #if defined(_WIN32) && !defined(WIN32_STATIC)
 /*
  * For a win32 DLL, we define WIN32_INDLL if this file
diff -r 573501c63fef -r 2d9f7d2e3558 src/protocols/oscar/ft.c
--- a/src/protocols/oscar/ft.c	Sat May 17 17:54:38 2003 +0000
+++ b/src/protocols/oscar/ft.c	Sat May 17 18:41:02 2003 +0000
@@ -40,10 +40,6 @@
  */
 
 #define FAIM_INTERNAL
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <aim.h>
 
 #ifndef _WIN32
diff -r 573501c63fef -r 2d9f7d2e3558 src/protocols/oscar/rxqueue.c
--- a/src/protocols/oscar/rxqueue.c	Sat May 17 17:54:38 2003 +0000
+++ b/src/protocols/oscar/rxqueue.c	Sat May 17 18:41:02 2003 +0000
@@ -82,7 +82,7 @@
 /*
  * Read a FLAP header from conn into fr, and return the number of bytes in the payload.
  */
-static faim_shortfunc int aim_get_command_flap(aim_session_t *sess, aim_conn_t *conn, aim_frame_t *fr)
+static int aim_get_command_flap(aim_session_t *sess, aim_conn_t *conn, aim_frame_t *fr)
 {
 	fu8_t flaphdr_raw[6];
 	aim_bstream_t flaphdr;
diff -r 573501c63fef -r 2d9f7d2e3558 src/protocols/oscar/util.c
--- a/src/protocols/oscar/util.c	Sat May 17 17:54:38 2003 +0000
+++ b/src/protocols/oscar/util.c	Sat May 17 18:41:02 2003 +0000
@@ -29,7 +29,7 @@
 	return;
 }
 
-faim_export faim_shortfunc int aimutil_putstr(u_char *dest, const char *src, int len)
+faim_export int aimutil_putstr(u_char *dest, const char *src, int len)
 {
 	memcpy(dest, src, len);
 	return len;