mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-16 14:28:34 +00:00
merge 2
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4877 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
631e689eb1
commit
b378d35534
3 files changed
+12
-10
No files matched your search
@@ -632,16 +632,16 @@
|
||||
/* */
|
||||
#undef SIGWAIT_TAKES_ONE_ARG
|
||||
|
||||
/* The size of a `char', as computed by sizeof. */
|
||||
/* The size of `char', as computed by sizeof. */
|
||||
#undef SIZEOF_CHAR
|
||||
|
||||
/* The size of a `int', as computed by sizeof. */
|
||||
/* The size of `int', as computed by sizeof. */
|
||||
#undef SIZEOF_INT
|
||||
|
||||
/* The size of a `long', as computed by sizeof. */
|
||||
/* The size of `long', as computed by sizeof. */
|
||||
#undef SIZEOF_LONG
|
||||
|
||||
/* The size of a `long long', as computed by sizeof. */
|
||||
/* The size of `long long', as computed by sizeof. */
|
||||
#undef SIZEOF_LONG_LONG
|
||||
|
||||
/* The size of off_t */
|
||||
@@ -650,7 +650,7 @@
|
||||
/* The size of pid_t */
|
||||
#undef SIZEOF_PID_T
|
||||
|
||||
/* The size of a `short', as computed by sizeof. */
|
||||
/* The size of `short', as computed by sizeof. */
|
||||
#undef SIZEOF_SHORT
|
||||
|
||||
/* The size of size_t */
|
||||
@@ -659,7 +659,7 @@
|
||||
/* The size of ssize_t */
|
||||
#undef SIZEOF_SSIZE_T
|
||||
|
||||
/* The size of a `void*', as computed by sizeof. */
|
||||
/* The size of `void*', as computed by sizeof. */
|
||||
#undef SIZEOF_VOIDP
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
@@ -752,13 +752,13 @@
|
||||
#undef inline
|
||||
#endif
|
||||
|
||||
/* Define to `long' if <sys/types.h> does not define. */
|
||||
/* Define to `long int' if <sys/types.h> does not define. */
|
||||
#undef off_t
|
||||
|
||||
/* Define to `int' if <sys/types.h> does not define. */
|
||||
#undef pid_t
|
||||
|
||||
/* Define to `unsigned' if <sys/types.h> does not define. */
|
||||
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
||||
#undef size_t
|
||||
|
||||
/* Define to `int' if <sys/types.h> does not define. */
|
||||
|
||||
@@ -640,7 +640,7 @@ static int on_disco_default(void *user_data, ikspak *pak)
|
||||
iks *iq, *query, *tag;
|
||||
uint8_t send = 0;
|
||||
int x;
|
||||
|
||||
printf("WTF ?????\n");
|
||||
if (pak && pak->query) {
|
||||
ns = iks_find_attrib(pak->query, "xmlns");
|
||||
node = iks_find_attrib(pak->query, "node");
|
||||
@@ -766,6 +766,7 @@ static int on_presence(void *user_data, ikspak *pak)
|
||||
|
||||
|
||||
if (resource && strstr(resource, "talk") && (buffer = apr_hash_get(handle->probe_hash, id, APR_HASH_KEY_STRING))) {
|
||||
printf("WTF Lookup %s\n", from);
|
||||
apr_cpystrn(buffer->buf, from, buffer->len);
|
||||
fflush(stderr);
|
||||
buffer->hit = 1;
|
||||
|
||||
Reference in new issue
Block a user