1 files changed, 6 insertions, 4 deletions

diff --git a/src/builtin.c b/src/builtin.c
index 9d1063c..8a07eab 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -7,26 +7,28 @@
    option) any later version.
 
    Wydawca is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
    with wydawca. If not, see <http://www.gnu.org/licenses/>. */
 
 #include "wydawca.h"
 #include "builtin.h"
-#include "fnmatch.h"
-#include "regex.h"
+
+#ifndef FNM_CASEFOLD
+# define FNM_CASEFOLD 0
+#endif
 
 int
 builtin_init (struct dictionary *dict)
 {
   return 0;
 }
 
 int
 builtin_done (struct dictionary *dict)
 {
   return 0;
 }
@@ -211,27 +213,27 @@ builtin_lookup (struct dictionary *dict, void *handle, const char *req)
 
   if (count == 0)
     {
       txtacc_free (acc);
       bds = NULL;
       rc = 1;
     }
   else
     {
       size_t i;
       char *p;
 
-      bds = xmalloc (sizeof (*bds));
+      bds = grecs_malloc (sizeof (*bds));
       count *= ncol;
-      bds->wp = xcalloc (count, sizeof (bds->wp[0]));
+      bds->wp = grecs_calloc (count, sizeof (bds->wp[0]));
       bds->acc = acc;
       p = txtacc_finish (acc, 0);
 
       for (i = 0; i < count; i++)
         {
           bds->wp[i] = p;
           p += strlen (p) + 1;
         }
       rc = 0;
     }
 
   dict->storage = bds;