bk commit into 5.0 tree (joerg:1.1780)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1780 05/03/03 12:35:39 joerg@stripped +1 -0
  Prevent a collision with the system's '#define errno ...' by guarding the variable declaration.

  include/my_sys.h
    1.140 05/03/03 12:35:35 joerg@stripped +2 -0
    There are platforms which use '#define errno ...' and then cause a collision with
    'extern int errno;', one example is OpenBSD.
    Rather than treat them explicitly by the 'HAVE_ERRNO_AS_DEFINE', we can check for these
    by using '#ifndef errno'.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/M50/push-5.0

--- 1.139/include/my_sys.h	Sun Feb 27 16:53:09 2005
+++ 1.140/include/my_sys.h	Thu Mar  3 12:35:35 2005
@@ -206,11 +206,13 @@
 #endif
 #endif /* MSDOS */
 
+#ifndef errno				/* did we already get it? */
 #ifdef HAVE_ERRNO_AS_DEFINE
 #include <errno.h>			/* errno is a define */
 #else
 extern int errno;			/* declare errno */
 #endif
+#endif					/* #ifndef errno */
 extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE];
 extern char *home_dir;			/* Home directory for user */
 extern char *my_progname;		/* program-name (printed in errors) */