Merge

client/mysqlbinlog.cc: Auto merged

Merge
client/mysqlbinlog.cc: Auto merged
63203a18 · unknown · e9bcbabe · 9feee76a · 63203a18 · 63203a18
Commit 63203a18 authored Aug 22, 2001 by unknown
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 332 additions and 285 deletions

Docs/manual.texi Docs/manual.texi +327 -280

include/my_pthread.h include/my_pthread.h +5 -5

No files found.
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -20,15 +20,15 @@
 #ifndef _my_pthread_h
 #define _my_pthread_h

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <errno.h>
 #ifndef ETIME
 #define ETIME ETIMEDOUT				/* For FreeBSD */
 #endif

+#ifdef  __cplusplus
+extern "C" {
+#endif /* __cplusplus */ 
+
 #if defined(__WIN__) || defined(OS2)

 #ifdef OS2
@@ -617,7 +617,7 @@ extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const));
 #endif /* HAVE_ATOMIC_ADD */
 #endif /* thread_safe_increment */

-#ifdef __cplusplus
+#ifdef  __cplusplus
 }
 #endif