← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/os/os0proc.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/os/os0proc.cc
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (C) 1995, 2009, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
147
147
                os_fast_mutex_unlock(&ut_list_mutex);
148
148
                UNIV_MEM_ALLOC(ptr, size);
149
149
        }
150
 
#elif defined __NETWARE__ || !defined OS_MAP_ANON
 
150
#elif !defined OS_MAP_ANON
151
151
        size = *n;
152
152
        ptr = ut_malloc_low(size, TRUE, FALSE);
153
153
#else
215
215
                os_fast_mutex_unlock(&ut_list_mutex);
216
216
                UNIV_MEM_FREE(ptr, size);
217
217
        }
218
 
#elif defined __NETWARE__ || !defined OS_MAP_ANON
 
218
#elif !defined OS_MAP_ANON
219
219
        ut_free(ptr);
220
220
#else
221
 
        if (munmap(ptr, size)) {
 
221
        if (munmap(static_cast<char *>(ptr), size)) {
222
222
                fprintf(stderr, "InnoDB: munmap(%p, %lu) failed;"
223
223
                        " errno %lu\n",
224
224
                        ptr, (ulong) size, (ulong) errno);