You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fa...@locus.apache.org on 2000/10/25 17:03:10 UTC
cvs commit: apache-2.0/src/support htdigest.c
fanf 00/10/25 08:03:06
Modified: src/lib/apr/file_io/unix pipe.c
src/lib/apr/i18n/unix xlate.c
src/main http_core.c
src/os/tpf os.c
src/support htdigest.c
Log:
ensure that all cpp directives start with a # in column one
PR: 6742
Revision Changes Path
1.40 +16 -16 apache-2.0/src/lib/apr/file_io/unix/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/pipe.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -u -r1.39 -r1.40
--- pipe.c 2000/10/18 16:59:52 1.39
+++ pipe.c 2000/10/25 15:02:41 1.40
@@ -61,29 +61,29 @@
int fd_flags;
fd_flags = fcntl(thepipe->filedes, F_GETFL, 0);
- #if defined(O_NONBLOCK)
+# if defined(O_NONBLOCK)
fd_flags &= ~O_NONBLOCK;
- #elif defined(~O_NDELAY)
+# elif defined(~O_NDELAY)
fd_flags &= ~O_NDELAY;
- #elif defined(FNDELAY)
+# elif defined(FNDELAY)
fd_flags &= ~O_FNDELAY;
- #else
+# else
/* XXXX: this breaks things, but an alternative isn't obvious...*/
return APR_ENOTIMPL;
- #endif
+# endif
if (fcntl(thepipe->filedes, F_SETFL, fd_flags) == -1) {
return errno;
}
#else
-#if BEOS_BONE /* This only works on BONE or beyond */
+# if BEOS_BONE /* This only works on BONE or beyond */
int on = 0;
if (ioctl(thepipe->filedes, FIONBIO, &on, sizeof(on)) < 0)
return errno;
-#else /* BEOS_BONE */
+# else /* BEOS_BONE */
return APR_ENOTIMPL;
-#endif /* BEOS_BONE */
+# endif /* BEOS_BONE */
#endif /* !BEOS_R5 */
@@ -96,29 +96,29 @@
#if !BEOS /* this code won't work on BeOS */
int fd_flags = fcntl(thepipe->filedes, F_GETFL, 0);
- #if defined(O_NONBLOCK)
+# if defined(O_NONBLOCK)
fd_flags |= O_NONBLOCK;
- #elif defined(O_NDELAY)
+# elif defined(O_NDELAY)
fd_flags |= O_NDELAY;
- #elif defined(FNDELAY)
+# elif defined(FNDELAY)
fd_flags |= O_FNDELAY;
- #else
+# else
/* XXXX: this breaks things, but an alternative isn't obvious...*/
return APR_ENOTIMPL;
- #endif
+# endif
if (fcntl(thepipe->filedes, F_SETFL, fd_flags) == -1) {
return errno;
}
#else /* !BEOS */
-#if BEOS_BONE /* This only works on BONE and later...*/
+# if BEOS_BONE /* This only works on BONE and later...*/
int on = 1;
if (ioctl(thepipe->filedes, FIONBIO, &on, sizeof(on)) < 0)
return errno;
-#else /* BEOS_BONE */
+# else /* BEOS_BONE */
return APR_ENOTIMPL;
-#endif /* BEOS_BONE */
+# endif /* BEOS_BONE */
#endif /* !BEOS */
1.13 +3 -3 apache-2.0/src/lib/apr/i18n/unix/xlate.c
Index: xlate.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/i18n/unix/xlate.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -u -r1.12 -r1.13
--- xlate.c 2000/08/20 04:14:49 1.12
+++ xlate.c 2000/10/25 15:02:51 1.13
@@ -99,11 +99,11 @@
static const char *get_default_charset(void)
{
#ifdef __MVS__
- #ifdef __CODESET__
+# ifdef __CODESET__
return __CODESET__;
- #else
+# else
return "IBM-1047";
- #endif
+# endif
#endif
if ('}' == 0xD0) {
1.186 +5 -5 apache-2.0/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -u -r1.185 -r1.186
--- http_core.c 2000/10/25 00:38:04 1.185
+++ http_core.c 2000/10/25 15:02:57 1.186
@@ -107,11 +107,11 @@
* the benefit for small files. It shouldn't be set lower than 1.
*/
#ifndef MMAP_THRESHOLD
- #ifdef SUNOS4
- #define MMAP_THRESHOLD (8*1024)
- #else
- #define MMAP_THRESHOLD 1
- #endif /* SUNOS4 */
+# ifdef SUNOS4
+# define MMAP_THRESHOLD (8*1024)
+# else
+# define MMAP_THRESHOLD 1
+# endif /* SUNOS4 */
#endif /* MMAP_THRESHOLD */
#ifndef MMAP_LIMIT
#define MMAP_LIMIT (4*1024*1024)
1.11 +2 -2 apache-2.0/src/os/tpf/os.c
Index: os.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/tpf/os.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- os.c 2000/10/23 15:30:57 1.10
+++ os.c 2000/10/25 15:03:01 1.11
@@ -382,7 +382,7 @@
}
int os_check_server(char *server) {
- #ifndef USE_TPF_DAEMON
+#ifndef USE_TPF_DAEMON
int rv;
int *current_acn;
if((rv = inetd_getServerStatus(server)) == INETD_SERVER_STATUS_INACTIVE)
@@ -392,7 +392,7 @@
if(ecbp2()->ce2acn != *current_acn)
return 1;
}
- #endif
+#endif
return 0;
}
1.14 +1 -1 apache-2.0/src/support/htdigest.c
Index: htdigest.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/support/htdigest.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- htdigest.c 2000/08/07 20:11:34 1.13
+++ htdigest.c 2000/10/25 15:03:03 1.14
@@ -68,7 +68,7 @@
#include "apr_md5.h"
#ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
+#include <sys/types.h>
#endif
#ifdef HAVE_SYS_SIGNAL_H