[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / modules / charset_macosxfs.c

diff --git a/source/modules/charset_macosxfs.c b/source/modules/charset_macosxfs.c
index a9003c7a826b868b34c9dbc624977e876a18e9c3..baf2a0071cbc64fcf50ef4ad2330bddc61b23898 100644 (file)
--- a/source/modules/charset_macosxfs.c
+++ b/source/modules/charset_macosxfs.c
@@ -5,7 +5,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
@@ -41,8 +40,8 @@
  * See if autoconf has found us the internal headers in some form.
  */
 #if HAVE_COREFOUNDATION_CFSTRINGENCODINGCONVERTER_H
-#      include <Corefoundation/CFStringEncodingConverter.h>
-#      include <Corefoundation/CFUnicodePrecomposition.h>
+#      include <CoreFoundation/CFStringEncodingConverter.h>
+#      include <CoreFoundation/CFUnicodePrecomposition.h>
 #      define USE_INTERNAL_API 1
 #elif HAVE_CFSTRINGENCODINGCONVERTER_H
 #      include <CFStringEncodingConverter.h>
@@ -62,7 +61,7 @@ static inline void *resize_buffer (void *buffer, size_t *size, size_t newsize)
 {
        if (newsize > *size) {
                *size = newsize + 128;
-               buffer = realloc(buffer, *size);
+               buffer = SMB_REALLOC(buffer, *size);
        }
        return buffer;
 }