From: Alex Waugh <alexwaugh@php.net>
Date: Sun, 23 Dec 2001 14:37:24 +0000 (+0000)
Subject: Check for ushort
X-Git-Tag: PRE_ISSET_PATCH~438
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57d2cec1709628ea25baa6660814c354406fd9d7;p=php

Check for ushort
---

diff --git a/ext/mysql/libmysql/acinclude.m4 b/ext/mysql/libmysql/acinclude.m4
index 957c87fb27..0fcc7205cd 100644
--- a/ext/mysql/libmysql/acinclude.m4
+++ b/ext/mysql/libmysql/acinclude.m4
@@ -295,6 +295,24 @@ then
 fi
 ])
 
+AC_DEFUN(MYSQL_CHECK_USHORT,
+[AC_MSG_CHECKING(for type ushort)
+AC_CACHE_VAL(ac_cv_ushort,
+[AC_TRY_RUN([#include <stdio.h>
+#include <sys/types.h>
+main()
+{
+  ushort foo;
+  foo++;
+  exit(0);
+}], ac_cv_ushort=yes, ac_cv_ushort=no, ac_cv_ushort=no)])
+AC_MSG_RESULT($ac_cv_ushort)
+if test "$ac_cv_ushort" = "yes"
+then
+  AC_DEFINE(HAVE_USHORT,,[ ])
+fi
+])
+
 AC_DEFUN(MYSQL_CHECK_INT_8_16_32,
 [AC_MSG_CHECKING([for int8])
 AC_CACHE_VAL(ac_cv_int8,
@@ -352,6 +370,7 @@ AC_TYPE_UID_T
 MYSQL_CHECK_ULONG
 MYSQL_CHECK_UCHAR
 MYSQL_CHECK_UINT
+MYSQL_CHECK_USHORT
 MYSQL_CHECK_INT_8_16_32
 
 MYSQL_TYPE_ACCEPT
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 804b7fa32f..e73e6c0357 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -50,6 +50,11 @@
 #include <netinet/in.h>
 #endif
 
+#ifndef HAVE_USHORT
+#undef ushort
+typedef unsigned short ushort;
+#endif
+
 /* True globals, no need for thread safety */
 static int le_result, le_link, le_plink;