JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Whitespace cleanup.

Browse Source 
* configure.in: Eliminate subdir stuff.
* configure: Regenerate.
* include/getopt.h (option): Make name field 'const'.
This commit is contained in:
Christopher Faylor 2000-10-28 05:41:44 +00:00
parent ce475802f8
commit 75a57bf04a
45 changed files with 196 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
Sat Oct 28 01:39:53 2000 Christopher Faylor <cgf@cygnus.com>
* configure.in: Eliminate subdir stuff.
* configure: Regenerate.
* include/getopt.h (option): Make name field 'const'.
Fri Oct 27 20:51:00 2000 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc: New file keeping all autoload stuff.

2
winsup/cygwin/autoload.h
View File

@ -46,7 +46,7 @@ static int dllname ## _init ()
*
* So, immediately following the the call to one of the above routines
* we have:
* foojmp (4 bytes) Pointer to a word containing the routine used
* foojmp (4 bytes) Pointer to a word containing the routine used
* to eventually invoke the function. Initially
* points to an init function which loads the
* DLL, gets the process's load address,

2
winsup/cygwin/config/i386/setjmp.c
View File

@ -11,7 +11,7 @@ details. */
#ifdef __i386__
#if 1
asm(" .globl _setjmp \n"
asm(" .globl _setjmp \n"
"_setjmp: \n"
" pushl %ebp \n"
" movl %esp,%ebp \n"

114
winsup/cygwin/configure vendored
View File

@ -1631,10 +1631,8 @@ EOF
fi
subdirs="utils doc"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:1638: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "configure:1636: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1671,7 +1669,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
#line 1675 "configure"
#line 1673 "configure"
#include "confdefs.h"
#include <string.h>
@ -1684,7 +1682,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:1688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_builtin_memset=yes
else
@ -1794,7 +1792,7 @@ fi
echo $ac_n "checking if newlib is part of the build tree""... $ac_c" 1>&6
echo "configure:1798: checking if newlib is part of the build tree" >&5
echo "configure:1796: checking if newlib is part of the build tree" >&5
EXE_LDFLAGS=
if test -d ../newlib
@ -1809,9 +1807,9 @@ fi
if test x"$EXE_LDFLAGS" = x
then
echo $ac_n "checking if installed newlib needed""... $ac_c" 1>&6
echo "configure:1813: checking if installed newlib needed" >&5
echo "configure:1811: checking if installed newlib needed" >&5
cat > conftest.$ac_ext <<EOF
#line 1815 "configure"
#line 1813 "configure"
#include "confdefs.h"
int main() {
@ -1819,7 +1817,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""no" 1>&6
@ -2012,7 +2010,6 @@ s%@DLLTOOL@%$DLLTOOL%g
s%@WINDRES@%$WINDRES%g
s%@CPP@%$CPP%g
s%@ALLOCA@%$ALLOCA%g
s%@subdirs@%$subdirs%g
s%@SET_MAKE@%$SET_MAKE%g
s%@MT_SAFE@%$MT_SAFE%g
s%@PTH_ALLOW@%$PTH_ALLOW%g
@ -2239,101 +2236,4 @@ chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
if test "$no_recursion" != yes; then
# Remove --cache-file and --srcdir arguments so they do not pile up.
ac_sub_configure_args=
ac_prev=
for ac_arg in $ac_configure_args; do
if test -n "$ac_prev"; then
ac_prev=
continue
fi
case "$ac_arg" in
-cache-file | --cache-file | --cache-fil | --cache-fi \
| --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
ac_prev=cache_file ;;
-cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
;;
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
ac_prev=srcdir ;;
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
;;
*) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
esac
done
for ac_config_dir in utils doc; do
# Do not complain, so a configure script can configure whichever
# parts of a large source tree are present.
if test ! -d $srcdir/$ac_config_dir; then
continue
fi
echo configuring in $ac_config_dir
case "$srcdir" in
.) ;;
*)
if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
else
{ echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
fi
;;
esac
ac_popdir=`pwd`
cd $ac_config_dir
# A "../" for each directory in /$ac_config_dir.
ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
case "$srcdir" in
.) # No --srcdir option. We are building in place.
ac_sub_srcdir=$srcdir ;;
/*) # Absolute path.
ac_sub_srcdir=$srcdir/$ac_config_dir ;;
*) # Relative path.
ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
esac
# Check for guested configure; otherwise get Cygnus style configure.
if test -f $ac_sub_srcdir/configure; then
ac_sub_configure=$ac_sub_srcdir/configure
elif test -f $ac_sub_srcdir/configure.in; then
ac_sub_configure=$ac_configure
else
echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
ac_sub_configure=
fi
# The recursion is here.
if test -n "$ac_sub_configure"; then
# Make the cache file name correct relative to the subdirectory.
case "$cache_file" in
/*) ac_sub_cache_file=$cache_file ;;
*) # Relative path.
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
case "$ac_given_INSTALL" in
[/$]*) INSTALL="$ac_given_INSTALL" ;;
*) INSTALL="$ac_dots$ac_given_INSTALL" ;;
esac
echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
# The eval makes quoting arguments work.
if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
then :
else
{ echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
fi
fi
cd $ac_popdir
done
fi

3
winsup/cygwin/configure.in
View File

@ -88,7 +88,6 @@ AC_CHECK_TOOL(WINDRES, windres, windres)
dnl C_SUBST(WINDRES)
AC_ALLOCA
AC_CONFIG_SUBDIRS(utils doc)
AC_PROG_MAKE_SET
dnl check whether gcc supports __builtin_memset.
@ -220,7 +219,7 @@ AC_SUBST(EXE_LDFLAGS)
case "$target_cpu" in
i386|i486|i586|i686) DLL_ENTRY="_dll_entry@12"
DEF_DLL_ENTRY="dll_entry@12"
ALLOCA="_alloca"
ALLOCA="_alloca"
CONFIG_DIR="i386" ;;
powerpc*) DLL_ENTRY="dll_entry"
DEF_DLL_ENTRY="dll_entry"

2
winsup/cygwin/fhandler_mem.cc
View File

@ -314,7 +314,7 @@ fhandler_dev_mem::mmap (caddr_t *addr, size_t len, DWORD access,
phys.QuadPart = (ULONGLONG) off;
if ((ret = NtMapViewOfSection (h,
INVALID_HANDLE_VALUE,
INVALID_HANDLE_VALUE,
&base,
0L,
dlen,

2
winsup/cygwin/fhandler_socket.cc
View File

@ -35,7 +35,7 @@ fhandler_socket::fhandler_socket (const char *name) :
set_cb (sizeof *this);
set_need_fork_fixup ();
prot_info_ptr = (LPWSAPROTOCOL_INFOA) cmalloc (HEAP_BUF,
sizeof (WSAPROTOCOL_INFOA));
sizeof (WSAPROTOCOL_INFOA));
}
fhandler_socket::~fhandler_socket ()

4
winsup/cygwin/include/arpa/telnet.h
View File

@ -87,8 +87,8 @@ extern char *telcmds[];
#define TELOPT_STATUS 5 /* give status */
#define TELOPT_TM 6 /* timing mark */
#define TELOPT_RCTE 7 /* remote controlled transmission and echo */
#define TELOPT_NAOL 8 /* negotiate about output line width */
#define TELOPT_NAOP 9 /* negotiate about output page size */
#define TELOPT_NAOL 8 /* negotiate about output line width */
#define TELOPT_NAOP 9 /* negotiate about output page size */
#define TELOPT_NAOCRD 10 /* negotiate about CR disposition */
#define TELOPT_NAOHTS 11 /* negotiate about horizontal tabstops */
#define TELOPT_NAOHTD 12 /* negotiate about horizontal tab disposition */

8
winsup/cygwin/include/cygwin/cygwin_dll.h
View File

@ -27,7 +27,7 @@ CDECL_BEGIN \
int WINAPI Entry (HINSTANCE h, DWORD reason, void *ptr); \
typedef int (*mainfunc) (int, char **, char **); \
extern int cygwin_attach_dll (HMODULE, mainfunc); \
extern void cygwin_detach_dll (DWORD); \
extern void cygwin_detach_dll (DWORD); \
CDECL_END \
\
static HINSTANCE storedHandle; \
@ -53,7 +53,7 @@ int WINAPI _cygwin_dll_entry (HINSTANCE h, DWORD reason, void *ptr) \
storedHandle = h; \
storedReason = reason; \
storedPtr = ptr; \
dll_index = cygwin_attach_dll (h, &__dllMain); \
dll_index = cygwin_attach_dll (h, &__dllMain); \
if (dll_index == (DWORD) -1) \
ret = 0; \
} \
@ -64,12 +64,12 @@ int WINAPI _cygwin_dll_entry (HINSTANCE h, DWORD reason, void *ptr) \
ret = Entry (h, reason, ptr); \
if (ret) \
{ \
cygwin_detach_dll (dll_index); \
cygwin_detach_dll (dll_index); \
dll_index = (DWORD) -1; \
} \
} \
break; \
\
\
case DLL_THREAD_ATTACH: \
{ \
ret = Entry (h, reason, ptr); \

4
winsup/cygwin/include/cygwin/in.h
View File

@ -151,8 +151,8 @@ struct sockaddr_in {
#define IN_LOOPBACK(a) ((((long int) (a)) & 0xff000000) == 0x7f000000)
/* Defines for Multicast INADDR */
#define INADDR_UNSPEC_GROUP 0xe0000000 /* 224.0.0.0 */
#define INADDR_ALLHOSTS_GROUP 0xe0000001 /* 224.0.0.1 */
#define INADDR_UNSPEC_GROUP 0xe0000000 /* 224.0.0.0 */
#define INADDR_ALLHOSTS_GROUP 0xe0000001 /* 224.0.0.1 */
#define INADDR_MAX_LOCAL_GROUP 0xe00000ff /* 224.0.0.255 */
/* <asm/byteorder.h> contains the htonl type stuff.. */

19
winsup/cygwin/include/cygwin/mtio.h
View File

@ -1,9 +1,6 @@
/*
* cygwin/mtio.h header file for Cygwin.
*
* Original written by H. Bergman for Linux.
* Changed for Cygwin by C. Vinschen.
*/
/* cygwin/mtio.h header file for Cygwin.
by C. Vinschen. */
#ifndef _CYGWIN_MTIO_H
#define _CYGWIN_MTIO_H
@ -95,7 +92,7 @@ struct mtget {
/* structure for MTIOCPOS - mag tape get position command */
struct mtpos {
long mt_blkno; /* current block number */
long mt_blkno; /* current block number */
};
@ -116,15 +113,15 @@ struct mtpos {
#define GMT_SM(x) ((x) & 0x10000000) /* DDS setmark */
#define GMT_EOD(x) ((x) & 0x08000000) /* DDS EOD */
#define GMT_WR_PROT(x) ((x) & 0x04000000)
/* #define GMT_ ? ((x) & 0x02000000) */
/* #define GMT_ ? ((x) & 0x02000000) */
#define GMT_ONLINE(x) ((x) & 0x01000000)
#define GMT_D_6250(x) ((x) & 0x00800000)
#define GMT_D_1600(x) ((x) & 0x00400000)
#define GMT_D_800(x) ((x) & 0x00200000)
#define GMT_PADDING(x) ((x) & 0x00100000) /* data padding */
#define GMT_HW_ECC(x) ((x) & 0x00080000) /* HW error correction */
#define GMT_PADDING(x) ((x) & 0x00100000) /* data padding */
#define GMT_HW_ECC(x) ((x) & 0x00080000) /* HW error correction */
#define GMT_DR_OPEN(x) ((x) & 0x00040000) /* door open (no tape) */
#define GMT_HW_COMP(x) ((x) & 0x00020000) /* HW compression */
#define GMT_HW_COMP(x) ((x) & 0x00020000) /* HW compression */
#define GMT_IM_REP_EN(x) ((x) & 0x00010000) /* immediate report mode */
/* 16 generic status bits unused */

6
winsup/cygwin/include/cygwin/socket.h
View File

@ -16,7 +16,7 @@ struct sockaddr {
#include <sys/types.h>
struct linger {
unsigned short l_onoff; /* Linger active */
unsigned short l_onoff; /* Linger active */
unsigned short l_linger; /* How long to linger for */
};
@ -25,8 +25,8 @@ struct msghdr
void * msg_name; /* Socket name */
int msg_namelen; /* Length of name */
struct iovec * msg_iov; /* Data blocks */
int msg_iovlen; /* Number of blocks */
void * msg_accrights; /* Per protocol magic (eg BSD file descriptor passing) */
int msg_iovlen; /* Number of blocks */
void * msg_accrights; /* Per protocol magic (eg BSD file descriptor passing) */
int msg_accrightslen; /* Length of rights list */
};

4
winsup/cygwin/include/getopt.h
View File

@ -39,9 +39,9 @@ extern "C" {
#endif
struct option {
char * name;
const char *name;
int has_arg;
int * flag;
int *flag;
int val;
};

2
winsup/cygwin/include/rapi.h
View File

@ -36,7 +36,7 @@ struct IRAPIStreamVtbl
typedef HRESULT (STDAPICALLTYPE RAPIEXT)(
DWORD cbInput, // [IN]
BYTE *pInput, // [IN]
DWORD *pcbOutput, // [OUT]
DWORD *pcbOutput, // [OUT]
BYTE **ppOutput, // [OUT]
IRAPIStream *pIRAPIStream // [IN]
);

5
winsup/cygwin/include/sys/mtio.h
View File

@ -1,7 +1,4 @@
/*
* sys/mtio.h header file for Cygwin.
*
*/
/* sys/mtio.h header file for Cygwin. */
#ifndef _SYS_MTIO_H
#define _SYS_MTIO_H

5
winsup/cygwin/include/sys/procfs.h
View File

@ -1,7 +1,4 @@
/*
* sys/procfs.h header file for Cygwin.
*
*/
/* sys/procfs.h header file for Cygwin. */
#ifndef _SYS_PROCFS_H
#define _SYS_PROCFS_H

2
winsup/cygwin/include/sys/resource.h
View File

@ -11,7 +11,7 @@ extern "C" {
#define RUSAGE_CHILDREN -1 /* terminated child processes */
struct rusage {
struct timeval ru_utime; /* user time used */
struct timeval ru_utime; /* user time used */
struct timeval ru_stime; /* system time used */
long ru_maxrss;
long ru_ixrss; /* XXX: 0 */

20
winsup/cygwin/include/sys/termios.h
View File

@ -8,10 +8,10 @@
#define TCIOFF 2
#define TCION 3
#define TCGETA 5
#define TCSETA 6
#define TCSETAW 7
#define TCSETAF 8
#define TCGETA 5
#define TCSETA 6
#define TCSETAW 7
#define TCSETAF 8
#define TCIFLUSH 0
#define TCOFLUSH 1
@ -167,23 +167,23 @@
#define VDISCARD 1
#define VEOL 2
#define VEOL2 3
#define VEOL2 3
#define VEOF 4
#define VERASE 5
#define VINTR 6
#define VKILL 7
#define VLNEXT 8
#define VLNEXT 8
#define VMIN 9
#define VQUIT 10
#define VREPRINT 11
#define VREPRINT 11
#define VSTART 12
#define VSTOP 13
#define VSUSP 14
#define VSWTC 15
#define VSWTC 15
#define VTIME 16
#define VWERASE 17
#define VWERASE 17
#define NCCS 18
#define NCCS 18
typedef unsigned char cc_t;
typedef unsigned int tcflag_t;

1
winsup/cygwin/include/tzfile.h
View File

@ -7,4 +7,3 @@
#define isleap(y) (((y) % 4) == 0 && ((y) % 100) != 0 || ((y) % 400) == 0)
#endif

2
winsup/cygwin/lib/cygwin_crt0.c
View File

@ -30,5 +30,5 @@ cygwin_crt0 (MainFunc f)
memset (u, 0, sizeof (u));
(void) _cygwin_crt0_common (f, u);
}
dll_crt0__FP11per_process (u); /* Jump into the dll, never to return */
dll_crt0__FP11per_process (u); /* Jump into the dll, never to return */
}

2
winsup/cygwin/lib/getopt.c
View File

@ -40,7 +40,7 @@ int opterr = 1; /* if error message should be printed */
int optind = 1; /* index into parent argv vector */
int optopt; /* character checked for validity */
int optreset; /* reset getopt */
char *optarg; /* argument associated with option */
char *optarg; /* argument associated with option */
static char * __progname (char *);
int getopt_internal (int, char * const *, const char *);

2
winsup/cygwin/localtime.c
View File

@ -346,7 +346,7 @@ static char tzfilehid[] = "@(#)tzfile.h 7.14";
#define TZ_MAGIC "TZif"
struct tzhead {
char tzh_magic[4]; /* TZ_MAGIC */
char tzh_magic[4]; /* TZ_MAGIC */
char tzh_reserved[16]; /* reserved for future use */
char tzh_ttisgmtcnt[4]; /* coded number of trans. time flags */
char tzh_ttisstdcnt[4]; /* coded number of trans. time flags */

6
winsup/cygwin/regexp/regexp.c
View File

@ -610,7 +610,7 @@ int *flagp;
goto done; /* and we are done */
case '?': case '+': case '*':
if (!regprev) /* If just ch in str, */
if (!regprev) /* If just ch in str, */
goto magic; /* use it */
/* End mult-char string one early */
regparse = regprev; /* Back up parse */
@ -949,12 +949,12 @@ char *prog;
}
break;
case ANYOF:
if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) == NULL)
if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) == NULL)
return(0);
reginput++;
break;
case ANYBUT:
if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) != NULL)
if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) != NULL)
return(0);
reginput++;
break;

10
winsup/cygwin/regexp/regsub.c
View File

@ -69,11 +69,11 @@ char *dest;
no = *src++ - '0';
else
no = -1;
if (no < 0) { /* Ordinary character. */
if (c == '\\' && (*src == '\\' || *src == '&'))
c = *src++;
*dst++ = c;
} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
if (no < 0) { /* Ordinary character. */
if (c == '\\' && (*src == '\\' || *src == '&'))
c = *src++;
*dst++ = c;
} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
len = prog->endp[no] - prog->startp[no];
(void) strncpy(dst, prog->startp[no], len);
dst += len;

2
winsup/cygwin/sigproc.h
View File

@ -10,7 +10,7 @@ details. */
#include <signal.h>
#define EXIT_SIGNAL 0x010000
#define EXIT_SIGNAL 0x010000
#define EXIT_REPARENTING 0x020000
#define EXIT_NOCLOSEALL 0x040000

2
winsup/cygwin/sysconf.cc
View File

@ -71,7 +71,7 @@ sysconf (int in)
SYSTEM_BASIC_INFORMATION sbi;
if ((ret = NtQuerySystemInformation (SystemBasicInformation,
(PVOID) &sbi,
sizeof sbi, NULL))
sizeof sbi, NULL))
!= STATUS_SUCCESS)
{
__seterrno_from_win_error (RtlNtStatusToDosError (ret));

2
winsup/cygwin/times.cc
View File

@ -62,7 +62,7 @@ times (struct tms * buf)
syscall_printf ("ticks %d, CLOCKS_PER_SEC %d", ticks, CLOCKS_PER_SEC);
syscall_printf ("user_time %d, kernel_time %d, creation_time %d, exit_time %d",
user_time, kernel_time, creation_time, exit_time);
user_time, kernel_time, creation_time, exit_time);
buf->tms_stime = __to_clock_t (&kernel_time, 0);
buf->tms_utime = __to_clock_t (&user_time, 0);
timeval_to_filetime (&myself->rusage_children.ru_stime, &kernel_time);