diff options
| author | Karoly Lorentey | 2005-03-06 13:31:20 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-03-06 13:31:20 +0000 |
| commit | a0d878a9ccbfb7c68dd7cfbe05c2b71b9bd5c830 (patch) | |
| tree | 79ba80d6f6c4b787c60b36ebcd87c1b26f0906e1 /src/macmenu.c | |
| parent | ab455350da7728b0f8e1daf92c084092d8a04c29 (diff) | |
| parent | be6e87e51aaa3a114bc4ff2ceccbc7c9aa2b30d0 (diff) | |
| download | emacs-a0d878a9ccbfb7c68dd7cfbe05c2b71b9bd5c830.tar.gz emacs-a0d878a9ccbfb7c68dd7cfbe05c2b71b9bd5c830.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 34-36, 142-158)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-142
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-143
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-144
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-145
(make-text-button): Default button type if not specified
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-146
quick-install-emacs: Use mkdir --verbose only when requested
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-147
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-148
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-149
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-150
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-151
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
Add info/dir to arch branch
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-153
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-154
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-155
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-156
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-157
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-158
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-34
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-35
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-36
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-303
Diffstat (limited to 'src/macmenu.c')
| -rw-r--r-- | src/macmenu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macmenu.c b/src/macmenu.c index f0696a49774..35615cc3796 100644 --- a/src/macmenu.c +++ b/src/macmenu.c | |||
| @@ -35,7 +35,7 @@ Boston, MA 02111-1307, USA. */ | |||
| 35 | #include "charset.h" | 35 | #include "charset.h" |
| 36 | #include "coding.h" | 36 | #include "coding.h" |
| 37 | 37 | ||
| 38 | #ifndef MAC_OSX | 38 | #if !TARGET_API_MAC_CARBON |
| 39 | #include <MacTypes.h> | 39 | #include <MacTypes.h> |
| 40 | #include <Menus.h> | 40 | #include <Menus.h> |
| 41 | #include <QuickDraw.h> | 41 | #include <QuickDraw.h> |
| @@ -47,7 +47,7 @@ Boston, MA 02111-1307, USA. */ | |||
| 47 | #if defined (__MRC__) || (__MSL__ >= 0x6000) | 47 | #if defined (__MRC__) || (__MSL__ >= 0x6000) |
| 48 | #include <ControlDefinitions.h> | 48 | #include <ControlDefinitions.h> |
| 49 | #endif | 49 | #endif |
| 50 | #endif /* not MAC_OSX */ | 50 | #endif /* not TARGET_API_MAC_CARBON */ |
| 51 | 51 | ||
| 52 | /* This may include sys/types.h, and that somehow loses | 52 | /* This may include sys/types.h, and that somehow loses |
| 53 | if this is not done before the other system files. */ | 53 | if this is not done before the other system files. */ |