diff options
| author | Joakim Verona | 2013-07-14 11:04:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-14 11:04:49 +0200 |
| commit | 0bb9bb0841d89fff09820a57369df4cb01b16b43 (patch) | |
| tree | 832bf9fa8415eef0ce464d22b3ee1300cfa90bb1 /src/xterm.h | |
| parent | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (diff) | |
| parent | 3af1c8684ed6e48fbc21481d129e9aa164752c6e (diff) | |
| download | emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.tar.gz emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/xdisp.c
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/xterm.h b/src/xterm.h index 4a5ebc66370..5415a77cf58 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -38,8 +38,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 38 | #include <X11/CoreP.h> /* foul, but we need this to use our own | 38 | #include <X11/CoreP.h> /* foul, but we need this to use our own |
| 39 | window inside a widget instead of one | 39 | window inside a widget instead of one |
| 40 | that Xt creates... */ | 40 | that Xt creates... */ |
| 41 | #include <X11/StringDefs.h> | ||
| 42 | |||
| 43 | typedef Widget xt_or_gtk_widget; | 41 | typedef Widget xt_or_gtk_widget; |
| 44 | #endif | 42 | #endif |
| 45 | 43 | ||