Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test --remove-sent-files.
[rsync/rsync.git]
/
popt
/
system.h
diff --git
a/popt/system.h
b/popt/system.h
index
338be45
..
02f05c1
100644
(file)
--- a/
popt/system.h
+++ b/
popt/system.h
@@
-19,6
+19,14
@@
#include <unistd.h>
#endif
#include <unistd.h>
#endif
+#if !defined(__GNUC__) || defined(APPLE)
+/* Apparently the OS X port of gcc gags on __attribute__.
+ *
+ * <http://www.opensource.apple.com/bugs/X/gcc/2512150.html> */
+#define __attribute__(x)
+
+#endif
+
#ifdef __NeXT
/* access macros are not declared in non posix mode in unistd.h -
don't try to use posix on NeXTstep 3.3 ! */
#ifdef __NeXT
/* access macros are not declared in non posix mode in unistd.h -
don't try to use posix on NeXTstep 3.3 ! */
@@
-41,8
+49,15
@@
# ifdef _AIX
#pragma alloca
# else
# ifdef _AIX
#pragma alloca
# else
-# ifndef alloca /* predefined by HP cc +Olibcalls */
+# if HAVE_ALLOCA
+# ifndef alloca /* predefined by HP cc +Olibcalls */
char *alloca ();
char *alloca ();
+# endif
+# else
+# ifdef alloca
+# undef alloca
+# endif
+# define alloca(sz) malloc(sz) /* Kludge this for now */
# endif
# endif
# endif
# endif
# endif
# endif
@@
-62,5
+77,6
@@
char *alloca ();
#define xstrdup(_str) strdup(_str)
#endif /* HAVE_MCHECK_H && defined(__GNUC__) */
#define xstrdup(_str) strdup(_str)
#endif /* HAVE_MCHECK_H && defined(__GNUC__) */
+#define UNUSED(x) x __attribute__((__unused__))
#include "popt.h"
#include "popt.h"