From e1e46622ac0fce73d802fa4a8a2e83cc25cd9e7a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Feb 2015 23:04:02 -0600 Subject: Revert "resolve merge" This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344. --- libpthread/linuxthreads/locale.c | 57 ---------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 libpthread/linuxthreads/locale.c (limited to 'libpthread/linuxthreads/locale.c') diff --git a/libpthread/linuxthreads/locale.c b/libpthread/linuxthreads/locale.c deleted file mode 100644 index 12497182d..000000000 --- a/libpthread/linuxthreads/locale.c +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright (C) 2003 Manuel Novoa III - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see - * . - */ - -#include -#include "pthread.h" -#include "internals.h" -#include -#include -#include - -extern struct _pthread_descr_struct __pthread_initial_thread; - -__locale_t __curlocale(void) -{ - pthread_descr self = thread_self(); - -#ifdef NDEBUG - return THREAD_GETMEM (self, locale); -#else - { - __locale_t r = THREAD_GETMEM (self, locale); - - assert(r); - - return r; - } -#endif -} - -__locale_t __curlocale_set(__locale_t newloc) -{ - __locale_t oldloc; - pthread_descr self = thread_self(); - - oldloc = THREAD_GETMEM (self, locale); - - assert(newloc != LC_GLOBAL_LOCALE); - assert(oldloc); - - THREAD_SETMEM (self, locale, newloc); - - return oldloc; -} -- cgit v1.2.3