Commit 32b370bb authored by unknown's avatar unknown
Browse files

Makefile.am, configure.in, mysys.dsp: 

  Removed unused files
.del-my_winsem.c:
  Delete: mysys/my_winsem.c
.del-my_semaphore.c:
  Delete: mysys/my_semaphore.c
.del-my_semaphore.h:
  Delete: include/my_semaphore.h


BitKeeper/deleted/.del-my_semaphore.c:
  Delete: mysys/my_semaphore.c
BitKeeper/deleted/.del-my_semaphore.h:
  Delete: include/my_semaphore.h
BitKeeper/deleted/.del-my_winsem.c:
  Delete: mysys/my_winsem.c
VC++Files/mysys/mysys.dsp:
  Removed unused files
configure.in:
  Removed unused files
include/Makefile.am:
  Removed unused files
mysys/Makefile.am:
  Removed unused files
parent 7a512b02

VC++Files/mysys/mysys.dsp

+0 −4
Original line number Diff line number Diff line
@@ -508,10 +508,6 @@ SOURCE=.\my_wincond.c 
# End Source File

# Begin Source File



SOURCE=.\my_winsem.c

# End Source File

# Begin Source File



SOURCE=.\my_winthread.c

# End Source File

# Begin Source File

configure.in

+0 −3
Original line number Diff line number Diff line
@@ -772,9 +772,6 @@ AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) 
AC_CHECK_LIB(crypt, crypt)

AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT)) 



# For sem_xxx functions on Solaris 2.6

AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))



# For compress in zlib

case $SYSTEM_TYPE in

  *netware* | *modesto*)

include/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
BUILT_SOURCES =		mysql_version.h m_ctype.h my_config.h

pkginclude_HEADERS =	my_dbug.h m_string.h my_sys.h my_list.h \

			mysql.h mysql_com.h mysqld_error.h mysql_embed.h \

		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \

		  	my_pthread.h my_no_pthread.h raid.h \

			errmsg.h my_global.h my_net.h my_alloc.h \

			my_getopt.h sslopt-longopts.h my_dir.h \

			sslopt-vars.h sslopt-case.h $(BUILT_SOURCES)

include/my_semaphore.h

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
/*

 * Module: semaphore.h

 *

 * Purpose:

 *      Semaphores aren't actually part of the PThreads standard.

 *      They are defined by the POSIX Standard:

 *

 *              POSIX 1003.1b-1993      (POSIX.1b)

 *

 * Pthreads-win32 - POSIX Threads Library for Win32

 * Copyright (C) 1998

 *

 * 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, write to the Free

 * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

 * MA 02111-1307, USA

 */



/* This is hacked by Monty to be included in mysys library */



#ifndef _my_semaphore_h_

#define _my_semaphore_h_



#ifdef THREAD



C_MODE_START

#ifdef HAVE_SEMAPHORE_H

#include <semaphore.h>

#elif !defined(__bsdi__)

#ifdef __WIN__

typedef HANDLE sem_t;

#else

typedef struct {

  pthread_mutex_t mutex;

  pthread_cond_t  cond;

  uint            count;

} sem_t;

#endif /* __WIN__ */



int sem_init(sem_t * sem, int pshared, unsigned int value);

int sem_destroy(sem_t * sem);

int sem_trywait(sem_t * sem);

int sem_wait(sem_t * sem);

int sem_post(sem_t * sem);

int sem_post_multiple(sem_t * sem, unsigned int count);

int sem_getvalue(sem_t * sem, unsigned int * sval);



#endif /* !__bsdi__ */



C_MODE_END



#endif /* THREAD */



#endif /* !_my_semaphore_h_ */

mysys/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\ 
			my_quick.c my_lockmem.c my_static.c \

			my_sync.c my_getopt.c my_mkdir.c \

			default.c my_compress.c checksum.c raid.cc \

			my_net.c my_semaphore.c my_port.c  my_sleep.c \

			my_net.c my_port.c  my_sleep.c \

			my_vsnprintf.c charset.c my_bitmap.c my_bit.c md5.c \

			my_gethostbyname.c rijndael.c my_aes.c sha1.c \

			my_netware.c