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
Don't define NORETURN for older gcc versions.
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
b8512de
..
d2e328e
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-513,14
+513,14
@@
struct hlink {
struct file_struct {
union {
dev_t rdev; /* The device number, if this is a device */
struct file_struct {
union {
dev_t rdev; /* The device number, if this is a device */
- c
har *sum;
/* Only a normal file can have a checksum */
- c
har *link;
/* Points to symlink string, if a symlink */
+ c
onst char *sum;
/* Only a normal file can have a checksum */
+ c
onst char *link;
/* Points to symlink string, if a symlink */
} u;
OFF_T length;
} u;
OFF_T length;
- c
har *basename;
/* The current item's name (AKA filename) */
- c
har *dirname;
/* The directory info inside the transfer */
+ c
onst char *basename;
/* The current item's name (AKA filename) */
+ c
onst char *dirname;
/* The directory info inside the transfer */
union {
union {
- c
har *root;
/* Sender-side dir info outside transfer */
+ c
onst char *root;
/* Sender-side dir info outside transfer */
int depth; /* Receiver-side directory depth info */
} dir;
union {
int depth; /* Receiver-side directory depth info */
} dir;
union {
@@
-648,7
+648,7
@@
struct stats {
int64 matched_data;
int64 flist_buildtime;
int64 flist_xfertime;
int64 matched_data;
int64 flist_buildtime;
int64 flist_xfertime;
- int flist_size;
+ int
64
flist_size;
int num_files;
int num_transferred_files;
int current_file_index;
int num_files;
int num_transferred_files;
int current_file_index;
@@
-664,10
+664,15
@@
struct chmod_mode_struct;
#ifndef __GNUC__
#define __attribute__(x)
#ifndef __GNUC__
#define __attribute__(x)
+# if __GNUC__ <= 2
+# define NORETURN
+# endif
#endif
#define UNUSED(x) x __attribute__((__unused__))
#endif
#define UNUSED(x) x __attribute__((__unused__))
+#ifndef NORETURN
#define NORETURN __attribute__((__noreturn__))
#define NORETURN __attribute__((__noreturn__))
+#endif
#include "proto.h"
#include "proto.h"