summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2002-07-03 18:45:38 +0200
committerunknown <lenz@mysql.com>2002-07-03 18:45:38 +0200
commit0670fc939be40a938b401590b3a821e0c28ff91b (patch)
tree65a935ba87804f544829b381550784cca307e304 /strings
parentef8712b2c7384d88b94c6c7542c3afa617ca66ca (diff)
downloadmariadb-git-0670fc939be40a938b401590b3a821e0c28ff91b.tar.gz
Added a compile fix for AIX to include/my_sys.h
Corrected some comments that were using C++-style instead of C-style include/my_sys.h: Portability fix: define alloca as a compiler builtin on systems that have gcc but no alloca.h (e.g. some IBM AIX flavors), use "#pragma alloca" for IBMs compiler (xlc) mysys/my_getopt.c: Replace C++-style comments with C-style comments strings/ctype-latin1_de.c: Replace C++-style comments with C-style comments strings/ctype-tis620.c: Replace C++-style comments with C-style comments
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-latin1_de.c4
-rw-r--r--strings/ctype-tis620.c30
2 files changed, 17 insertions, 17 deletions
diff --git a/strings/ctype-latin1_de.c b/strings/ctype-latin1_de.c
index 86b667b8f40..01d377f91c3 100644
--- a/strings/ctype-latin1_de.c
+++ b/strings/ctype-latin1_de.c
@@ -339,7 +339,7 @@ my_bool my_like_range_latin1_de(const char *ptr, uint ptr_length,
*min_length = (uint)(min_str - min_org);
*max_length = res_length;
do {
- *min_str++ = ' '; // Because if key compression
+ *min_str++ = ' '; /* Because if key compression */
*max_str++ = max_sort_char;
} while (min_str != min_end);
return 0;
@@ -356,6 +356,6 @@ my_bool my_like_range_latin1_de(const char *ptr, uint ptr_length,
}
while (min_str != min_end)
- *min_str++ = *max_str++ = ' '; // Because if key compression
+ *min_str++ = *max_str++ = ' '; /* Because if key compression */
return 0;
}
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index 370c4c773c6..d5181dc4db0 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -460,8 +460,8 @@ static uchar* thai2sortable(const uchar * tstr,uint len)
const uchar* p = tstr;
uchar *outBuf;
-// uchar *pRight1, *pRight2, *pRight3, *pRight4;
-// uchar *pLeft1, *pLeft2, *pLeft3, *pLeft4;
+/* uchar *pRight1, *pRight2, *pRight3, *pRight4; */
+/* uchar *pLeft1, *pLeft2, *pLeft3, *pLeft4; */
uchar *pRight1, *pRight2, *pRight3;
uchar *pLeft1, *pLeft2, *pLeft3;
uint bufSize;
@@ -496,11 +496,11 @@ static uchar* thai2sortable(const uchar * tstr,uint len)
*pRight1++ = t_ctype[p[1]][0];
*pRight2++ = t_ctype[p[1]][1];
*pRight3++ = t_ctype[p[1]][2];
-// *pRight4++ = t_ctype[p[1]][3];
+/* *pRight4++ = t_ctype[p[1]][3]; */
*pRight1++ = t_ctype[*p][0];
*pRight2++ = t_ctype[*p][1];
*pRight3++ = t_ctype[*p][2];
-// *pRight4++ = t_ctype[*p][3];
+/* *pRight4++ = t_ctype[*p][3]; */
len--;
p += 2;
} else {
@@ -517,17 +517,17 @@ static uchar* thai2sortable(const uchar * tstr,uint len)
}
*pRight1++ = L2_BLANK;
*pRight2++ = L3_BLANK;
-// *pRight3++ = L4_BLANK;
+/* *pRight3++ = L4_BLANK; */
*pRight3++ = '\0';
-// *pRight4++ = '\0';
+/* *pRight4++ = '\0'; */
memcpy(pRight1, pLeft2, pRight2 - pLeft2);
pRight1 += pRight2 - pLeft2;
memcpy(pRight1, pLeft3, pRight3 - pLeft3);
-// pRight1 += pRight3 - pLeft3;
-// memcpy(pRight1, pLeft4, pRight4 - pLeft4);
+/* pRight1 += pRight3 - pLeft3; */
+/* memcpy(pRight1, pLeft4, pRight4 - pLeft4); */
free(pLeft2);
free(pLeft3);
-// free(pLeft4);
+/* free(pLeft4); */
return(outBuf);
}
@@ -619,22 +619,22 @@ my_bool my_like_range_tis620(const char *ptr, uint ptr_length, pchar escape,
{
if (*ptr == escape && ptr+1 != end)
{
- ptr++; // Skipp escape
+ ptr++; /* Skipp escape */
*min_str++= *max_str++ = *ptr;
continue;
}
- if (*ptr == wild_one) // '_' in SQL
+ if (*ptr == wild_one) /* '_' in SQL */
{
- *min_str++='\0'; // This should be min char
+ *min_str++='\0'; /* This should be min char */
*max_str++=max_sort_chr;
continue;
}
- if (*ptr == wild_many) // '%' in SQL
+ if (*ptr == wild_many) /* '%' in SQL */
{
*min_length= (uint) (min_str - min_org);
*max_length=res_length;
do {
- *min_str++ = ' '; // Because if key compression
+ *min_str++ = ' '; /* Because if key compression */
*max_str++ = max_sort_chr;
} while (min_str != min_end);
return 0;
@@ -644,7 +644,7 @@ my_bool my_like_range_tis620(const char *ptr, uint ptr_length, pchar escape,
*min_length= *max_length = (uint) (min_str - min_org);
while (min_str != min_end)
- *min_str++ = *max_str++ = ' '; // Because if key compression
+ *min_str++ = *max_str++ = ' '; /* Because if key compression */
return 0;
}